商户后台统计恢复

app/common/repositories/finance/FinanceRepository.php

@@ -28,142 +28,217 @@ class FinanceRepository extends BaseRepository
      */
     public function order_overview($mer_id = 0)
     {
-        // if ($mer_id) {
-        //     $where = "mer_id = " . $mer_id . " and paid = 1";
-        // } else {
+        if ($mer_id) {
+            $where = "mer_id = " . $mer_id . " and paid = 1";
+            $type = input('type', 1);
+            $day = input('day', '');
+    
+            if ($type == 1 and $day != '') {
+                $where .= " and DATE(pay_time) = '" . $day . "'";
+            }
+            if ($type == 2 and $day != '') {
+                $date = new \DateTime($day);
+                $year = $date->format('Y');
+                $month = $date->format('m');
+    
+                $where .= " and YEAR(pay_time) = " . $year . " AND MONTH(pay_time) = " . $month;
+            }
+            $xianshangzhifu = Db::name('store_order')->where($where)->whereIn('pay_type', [0, 1])->sum('pay_price');
+            $xianshangzhifu_xuni = Db::name('store_order')->where($where)->where('pay_type', 0)->sum('pay_price');
+            $hongjifenxiaofei = Db::name('store_order')->where($where)->where("pay_type", 5)->sum('pay_price');
+    
+            $chengjiaomoney = decimal2($xianshangzhifu + $hongjifenxiaofei);
+            $list1[] = ['count' => set_price_rtrim($xianshangzhifu), 'name' => '线上支付金额'];
+            if (!$mer_id) {
+                $list1[] = ['count' => set_price_rtrim($xianshangzhifu_xuni), 'name' => '虚拟支付金额'];
+            }
+            $list1[] = ['count' => 0, 'name' => '代付金额'];
+            $xianshangzhifunum = Db::name('store_order')->where($where)->whereIn('pay_type', [0, 1])->count();
+            $xianshangzhifunum_xuni = Db::name('store_order')->where($where)->where('pay_type', 0)->count();
+            $hongjifenxiaofeinum = Db::name('store_order')->where($where)->where("pay_type", 5)->count();
+    
+            $chengjiaocount = $xianshangzhifunum + $hongjifenxiaofeinum;
+    
+            $list2[] = ['count' => $xianshangzhifunum, 'name' => '线上支付订单量'];
+            if (!$mer_id) {
+                $list2[] = ['count' => $xianshangzhifunum_xuni, 'name' => '虚拟支付订单量'];
+            }
+            $list2[] = ['count' => 0, 'name' => '代付订单量'];
+            $xianshangzhifuren = Db::name('store_order')->where($where)->whereIn('pay_type', [0, 1])->group('uid')->count();
+            $xianshangzhifuren_xuni = Db::name('store_order')->where($where)->where('pay_type', 0)->group('uid')->count();
+            $hongjifenxiaofeiren = Db::name('store_order')->where($where)->where("pay_type", 5)->group('uid')->count();
+    
+            $chengjiaoren = Db::name('store_order')->where($where)->whereIn('pay_type', [0, 1, 5])->group('uid')->count();
+            $list3[] = ['count' => set_price_rtrim($xianshangzhifuren), 'name' => '线上支付人数'];
+            if (!$mer_id) {
+                $list3[] = ['count' => set_price_rtrim($xianshangzhifuren_xuni), 'name' => '虚拟支付人数'];
+            }
+            $list3[] = ['count' => 0, 'name' => '代付人数'];
+    
+    
+            $xianshangtuikuan = Db::name('store_order')->where($where)->where('status', -1)->sum('pay_price');
+    
+            $tuikuanmoney = $xianshangtuikuan;
+            $list4 = array(
+                array('count' => $xianshangtuikuan, 'name' => '线上支付退单'),
+                array('count' => 0, 'name' => '代付退单'),
+            );
+            $xianshangzhifutuinum = Db::name('store_order')->where($where)->where('status', -1)->count();
+    
+            $tuikuancount = $xianshangzhifutuinum;
+            $list5 = array(
+                array('count' => set_price_rtrim($xianshangzhifutuinum), 'name' => '线上支付退单量'),
+                array('count' => 0, 'name' => '代付退单量'),
+            );
+            $xianshangzhifutuiremn = Db::name('store_order')->where($where)->where('status', -1)->group('uid')->count();
+    
+            $tuikuanren = $xianshangzhifutuiremn;
+            $list6 = array(
+                array('count' => set_price_rtrim($xianshangzhifutuiremn), 'name' => '线上支付退单人数'),
+                array('count' => 0, 'name' => '代付退单数'),
+            );
+    
+    
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaomoney), 'name' => '成交金额', 'list' => $list1];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaocount), 'name' => '成交订单量', 'list' => $list2];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaoren), 'name' => '支付人数', 'list' => $list3];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanmoney), 'name' => '退款金额', 'list' => $list4];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuancount), 'name' => '退款订单量', 'list' => $list5];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanren), 'name' => '退款人数', 'list' => $list6];
+            return $data;
+        } else {
             $where = " paid = 1";
-        // }
-
-        $type = input('type', 1);
-        $day = input('day', '');
-        //天
-        if ($type == 1 and $day != '') {
-            $where .= " and DATE(create_time) = '" . $day . "'";
-        }
-        //月
-        if ($type == 2 and $day != '') {
-            $date = new \DateTime($day);
-            $year = $date->format('Y');
-            $month = $date->format('m');
-            $where .= " and YEAR(create_time) = " . $year . " AND MONTH(create_time) = " . $month;
+            $type = input('type', 1);
+            $day = input('day', '');
+            //天
+            if ($type == 1 and $day != '') {
+                $where .= " and DATE(create_time) = '" . $day . "'";
+            }
+            //月
+            if ($type == 2 and $day != '') {
+                $date = new \DateTime($day);
+                $year = $date->format('Y');
+                $month = $date->format('m');
+                $where .= " and YEAR(create_time) = " . $year . " AND MONTH(create_time) = " . $month;
+            }
+    
+            $weekWhere = " paid = 1";
+            $dayWhere = " paid = 1";
+            // 获取今天的日期和时间
+            $today = new \DateTime();
+            // 计算一周前的日期
+            $oneWeekAgo = clone $today; // 克隆一个对象，避免修改原始对象
+            $oneWeekAgo->sub(new \DateInterval('P1W')); // 减去一周
+            
+            // 格式化日期
+            $todayFormatted = $today->format('Y-m-d');
+            $oneWeekAgoFormatted = $oneWeekAgo->format('Y-m-d');
+    
+            //周时间条件
+            $weekWhere .= " and DATE(create_time) >= '" . $oneWeekAgoFormatted . "' and DATE(create_time) <= '" . $todayFormatted . "'";
+            //今日时间条件
+            $dayWhere .= " and DATE(create_time) = '" . $todayFormatted . "'";
+    
+    
+            // 会员专区订单总数
+            //总数
+            $chengjiaomoney = Db::name('store_order')->where($where)->where('mer_id', 496)->count();
+            $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 496)->count();
+            $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 496)->count();
+            $list1[] = ['count' => $weekCount, 'name' => '周订单总数'];
+            $list1[] = ['count' => $todayCount, 'name' => '日订单总数'];
+    
+            //精彩生活区订单总数
+            //总数
+            $chengjiaocount = Db::name('store_order')->where($where)->where('mer_id', 439)->count();
+            $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 439)->count();
+            $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 439)->count();
+            $list2[] = ['count' => $weekCount, 'name' => '周订单总数'];
+            $list2[] = ['count' => $todayCount, 'name' => '日订单总数'];
+    
+            //商贸区订单总数
+            //总数
+            $chengjiaoren = Db::name('store_order')->where($where)->whereNotIn('mer_id', [496, 439, 491])->count();
+            $weekCount = Db::name('store_order')->where($weekWhere)->whereNotIn('mer_id', [496, 439, 491])->count();
+            $todayCount = Db::name('store_order')->where($dayWhere)->whereNotIn('mer_id', [496, 439, 491])->count();
+            $list3[] = ['count' => $weekCount, 'name' => '周订单总数'];
+            $list3[] = ['count' => $todayCount, 'name' => '日订单总数'];
+    
+            //复购区订单总数
+            //总数
+            $tuikuanmoney = Db::name('store_order')->where($where)->where('mer_id', 491)->count();
+            $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 491)->count();
+            $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 491)->count();
+            $list4[] = ['count' => $weekCount, 'name' => '周订单总数'];
+            $list4[] = ['count' => $todayCount, 'name' => '日订单总数'];
+    
+            //三方平台订单总数
+            //总数
+    
+            //话费
+            $whereNew = str_replace("paid", "status", $where);
+            $weekWhereNew = str_replace("paid", "status", $weekWhere);
+            $dayWhereNew = str_replace("paid", "status", $dayWhere);
+            $huafei = Db::name('order_huafei_hf')->where($whereNew)->count();
+            $huafei_week = Db::name('order_huafei_hf')->where($weekWhereNew)->count();
+            $huafei_today = Db::name('order_huafei_hf')->where($dayWhereNew)->count();
+    
+    
+            //京东
+            $whereNew = str_replace(" paid = 1", " status IN (16, 17)", $where);
+            $weekWhereNew = str_replace(" paid = 1", " status IN (16, 17)", $weekWhere);
+            $dayWhereNew = str_replace(" paid = 1", " status IN (16, 17)", $dayWhere);
+            $jd = Db::name('order_jd')->where($whereNew)->count();
+            $jd_week = Db::name('order_jd')->where($weekWhereNew)->count();
+            $jd_today = Db::name('order_jd')->where($dayWhereNew)->count();
+    
+            //拼多多
+            $whereNew = str_replace(" paid = 1", " pin_order_status IN (0, 2, 3)", $where);
+            $weekWhereNew = str_replace(" paid = 1", " pin_order_status IN (0, 2, 3)", $weekWhere);
+            $dayWhereNew = str_replace(" paid = 1", " pin_order_status IN (0, 2, 3)", $dayWhere);
+            $pdd = Db::name('order_pdd')->where($whereNew)->count();
+            $pdd_week = Db::name('order_pdd')->where($weekWhereNew)->count();
+            $pdd_today = Db::name('order_pdd')->where($dayWhereNew)->count();
+    
+            //淘宝
+            $whereNew = str_replace(" paid = 1", " tk_status IN (12, 3)", $where);
+            $weekWhereNew = str_replace(" paid = 1", " tk_status IN (12, 3)", $weekWhere);
+            $dayWhereNew = str_replace(" paid = 1", " tk_status IN (12, 3)", $dayWhere);
+            $tb = Db::name('order_tb')->where($whereNew)->count();
+            $tb_week = Db::name('order_tb')->where($weekWhereNew)->count();
+            $tb_today = Db::name('order_tb')->where($dayWhereNew)->count();
+    
+            //电影票
+            $whereNew = str_replace(" paid = 1", " status IN (1, 4)", $where);
+            $weekWhereNew = str_replace(" paid = 1", " status IN (1, 4)", $weekWhere);
+            $dayWhereNew = str_replace(" paid = 1", " status IN (1, 4)", $dayWhere);
+            $movie = Db::name('order_movie')->where($whereNew)->count();
+            $movie_week = Db::name('order_movie')->where($weekWhereNew)->count();
+            $movie_today = Db::name('order_movie')->where($dayWhereNew)->count();
+    
+            $tuikuancount = $huafei+$jd+$pdd+$tb+$movie;
+            $weekCount = $huafei_week+$jd_week+$pdd_week+$tb_week+$movie_week;
+            $todayCount = $huafei_today+$jd_today+$pdd_today+$tb_today+$movie_today;
+            $list5[] = ['count' => $weekCount, 'name' => '周订单总数'];
+            $list5[] = ['count' => $todayCount, 'name' => '日订单总数'];
+    
+            //线下订单总数
+            //总数
+            $tuikuanren = Db::name('order_merchant')->where($where)->count();
+            $weekCount = Db::name('order_merchant')->where($weekWhere)->count();
+            $todayCount = Db::name('order_merchant')->where($dayWhere)->count();
+            $list6[] = ['count' => $weekCount, 'name' => '周订单总数'];
+            $list6[] = ['count' => $todayCount, 'name' => '日订单总数'];
+    
+    
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaomoney), 'name' => '会员专区订单总数', 'list' => $list1];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaocount), 'name' => '精彩生活区订单总数', 'list' => $list2];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaoren), 'name' => '商贸区订单总数', 'list' => $list3];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanmoney), 'name' => '复购区订单总数', 'list' => $list4];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuancount), 'name' => '三方平台订单总数', 'list' => $list5];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanren), 'name' => '线下订单总数', 'list' => $list6];
+            return $data;
         }
-
-        $weekWhere = " paid = 1";
-        $dayWhere = " paid = 1";
-        // 获取今天的日期和时间
-        $today = new \DateTime();
-        // 计算一周前的日期
-        $oneWeekAgo = clone $today; // 克隆一个对象，避免修改原始对象
-        $oneWeekAgo->sub(new \DateInterval('P1W')); // 减去一周
-        
-        // 格式化日期
-        $todayFormatted = $today->format('Y-m-d');
-        $oneWeekAgoFormatted = $oneWeekAgo->format('Y-m-d');
-
-        //周时间条件
-        $weekWhere .= " and DATE(create_time) >= '" . $oneWeekAgoFormatted . "' and DATE(create_time) <= '" . $todayFormatted . "'";
-        //今日时间条件
-        $dayWhere .= " and DATE(create_time) = '" . $todayFormatted . "'";
-
-
-        // 会员专区订单总数
-        //总数
-        $chengjiaomoney = Db::name('store_order')->where($where)->where('mer_id', 496)->count();
-        $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 496)->count();
-        $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 496)->count();
-        $list1[] = ['count' => $weekCount, 'name' => '周订单总数'];
-        $list1[] = ['count' => $todayCount, 'name' => '日订单总数'];
-
-        //精彩生活区订单总数
-        //总数
-        $chengjiaocount = Db::name('store_order')->where($where)->where('mer_id', 439)->count();
-        $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 439)->count();
-        $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 439)->count();
-        $list2[] = ['count' => $weekCount, 'name' => '周订单总数'];
-        $list2[] = ['count' => $todayCount, 'name' => '日订单总数'];
-
-        //商贸区订单总数
-        //总数
-        $chengjiaoren = Db::name('store_order')->where($where)->whereNotIn('mer_id', [496, 439, 491])->count();
-        $weekCount = Db::name('store_order')->where($weekWhere)->whereNotIn('mer_id', [496, 439, 491])->count();
-        $todayCount = Db::name('store_order')->where($dayWhere)->whereNotIn('mer_id', [496, 439, 491])->count();
-        $list3[] = ['count' => $weekCount, 'name' => '周订单总数'];
-        $list3[] = ['count' => $todayCount, 'name' => '日订单总数'];
-
-        //复购区订单总数
-        //总数
-        $tuikuanmoney = Db::name('store_order')->where($where)->where('mer_id', 491)->count();
-        $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 491)->count();
-        $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 491)->count();
-        $list4[] = ['count' => $weekCount, 'name' => '周订单总数'];
-        $list4[] = ['count' => $todayCount, 'name' => '日订单总数'];
-
-        //三方平台订单总数
-        //总数
-
-        //话费
-        $whereNew = str_replace("paid", "status", $where);
-        $weekWhereNew = str_replace("paid", "status", $weekWhere);
-        $dayWhereNew = str_replace("paid", "status", $dayWhere);
-        $huafei = Db::name('order_huafei_hf')->where($whereNew)->count();
-        $huafei_week = Db::name('order_huafei_hf')->where($weekWhereNew)->count();
-        $huafei_today = Db::name('order_huafei_hf')->where($dayWhereNew)->count();
-
-
-        //京东
-        $whereNew = str_replace(" paid = 1", " status IN (16, 17)", $where);
-        $weekWhereNew = str_replace(" paid = 1", " status IN (16, 17)", $weekWhere);
-        $dayWhereNew = str_replace(" paid = 1", " status IN (16, 17)", $dayWhere);
-        $jd = Db::name('order_jd')->where($whereNew)->count();
-        $jd_week = Db::name('order_jd')->where($weekWhereNew)->count();
-        $jd_today = Db::name('order_jd')->where($dayWhereNew)->count();
-
-        //拼多多
-        $whereNew = str_replace(" paid = 1", " pin_order_status IN (0, 2, 3)", $where);
-        $weekWhereNew = str_replace(" paid = 1", " pin_order_status IN (0, 2, 3)", $weekWhere);
-        $dayWhereNew = str_replace(" paid = 1", " pin_order_status IN (0, 2, 3)", $dayWhere);
-        $pdd = Db::name('order_pdd')->where($whereNew)->count();
-        $pdd_week = Db::name('order_pdd')->where($weekWhereNew)->count();
-        $pdd_today = Db::name('order_pdd')->where($dayWhereNew)->count();
-
-        //淘宝
-        $whereNew = str_replace(" paid = 1", " tk_status IN (12, 3)", $where);
-        $weekWhereNew = str_replace(" paid = 1", " tk_status IN (12, 3)", $weekWhere);
-        $dayWhereNew = str_replace(" paid = 1", " tk_status IN (12, 3)", $dayWhere);
-        $tb = Db::name('order_tb')->where($whereNew)->count();
-        $tb_week = Db::name('order_tb')->where($weekWhereNew)->count();
-        $tb_today = Db::name('order_tb')->where($dayWhereNew)->count();
-
-        //电影票
-        $whereNew = str_replace(" paid = 1", " status IN (1, 4)", $where);
-        $weekWhereNew = str_replace(" paid = 1", " status IN (1, 4)", $weekWhere);
-        $dayWhereNew = str_replace(" paid = 1", " status IN (1, 4)", $dayWhere);
-        $movie = Db::name('order_movie')->where($whereNew)->count();
-        $movie_week = Db::name('order_movie')->where($weekWhereNew)->count();
-        $movie_today = Db::name('order_movie')->where($dayWhereNew)->count();
-
-        $tuikuancount = $huafei+$jd+$pdd+$tb+$movie;
-        $weekCount = $huafei_week+$jd_week+$pdd_week+$tb_week+$movie_week;
-        $todayCount = $huafei_today+$jd_today+$pdd_today+$tb_today+$movie_today;
-        $list5[] = ['count' => $weekCount, 'name' => '周订单总数'];
-        $list5[] = ['count' => $todayCount, 'name' => '日订单总数'];
-
-        //线下订单总数
-        //总数
-        $tuikuanren = Db::name('order_merchant')->where($where)->count();
-        $weekCount = Db::name('order_merchant')->where($weekWhere)->count();
-        $todayCount = Db::name('order_merchant')->where($dayWhere)->count();
-        $list6[] = ['count' => $weekCount, 'name' => '周订单总数'];
-        $list6[] = ['count' => $todayCount, 'name' => '日订单总数'];
-
-
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaomoney), 'name' => '会员专区订单总数', 'list' => $list1];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaocount), 'name' => '精彩生活区订单总数', 'list' => $list2];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaoren), 'name' => '商贸区订单总数', 'list' => $list3];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanmoney), 'name' => '复购区订单总数', 'list' => $list4];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuancount), 'name' => '三方平台订单总数', 'list' => $list5];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanren), 'name' => '线下订单总数', 'list' => $list6];
-        return $data;
     }
 
     /**
@@ -184,46 +259,97 @@ class FinanceRepository extends BaseRepository
                 $chilid_userids_string = implode(',',$chilid_userids);
             }
             $where .= "and uid in ({$chilid_userids_string})";
-        }
-        $type = input('type', 1);
-        $day = input('day', '');
 
-        if ($type == 1 and $day != '') {
-            $where .= " and DATE(create_time) = '" . $day . "'";
-        }
-        if ($type == 2 and $day != '') {
-            $date = new \DateTime($day);
-            $year = $date->format('Y');
-            $month = $date->format('m');
-            $where .= " and YEAR(create_time) = " . $year . " AND MONTH(create_time) = " . $month;
+            $where = "1=1 ";
+            if ($mer_id) {
+                $mer_uid = Db::name('merchant')->where('mer_id', $mer_id)->value('uid');
+                $userRepository = app()->make(UserRepository::class);
+                $chilid_userids = $userRepository->getSpreadUidBreak($mer_uid);
+                $chilid_userids_string = "1";
+                if (!empty($chilid_userids)) {
+                    $chilid_userids_string = implode(',',$chilid_userids);
+                }
+                $where .= "and uid in ({$chilid_userids_string})";
+            }
+            $type = input('type', 1);
+            $day = input('day', '');
+    
+            if ($type == 1 and $day != '') {
+                $where .= " and DATE(create_time) = '" . $day . "'";
+            }
+            if ($type == 2 and $day != '') {
+                $date = new \DateTime($day);
+                $year = $date->format('Y');
+                $month = $date->format('m');
+                $where .= " and YEAR(create_time) = " . $year . " AND MONTH(create_time) = " . $month;
+            }
+            $dataQuery = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where {$where} group by user_group");
+            $dataQuery = array_column($dataQuery, 'count', 'user_group');
+            $shopPartnerCount = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where mer_id={$mer_id} and is_shop_partner=1 group by user_group");
+    
+            $maker = Db::query("SELECT CONCAT(`user_group`, '-',`is_show`) as k, count(uid) count FROM `rrx_user` where {$where} group by user_group,is_show");
+            $maker = array_column($maker, 'count', 'k');
+    
+            $userByCodeCount = Db::query("SELECT 'temp' as `temp1`, count(*) count FROM `rrx_user` where {$where} and user_group =4 and is_show = 3");
+            $userByCodeCount = array_column($userByCodeCount, 'count', 'temp1');
+    
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[1] ?? 0), 'name' => '消费者'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[2] ?? 0), 'name' => '业务员'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[3] ?? 0), 'name' => '业务经理'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[5] ?? 0), 'name' => '初级合伙人'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[6] ?? 0), 'name' => '中级合伙人'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[7] ?? 0), 'name' => '高级合伙人'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[8] ?? 0), 'name' => '董事'];
+            $list1 = array(
+                array('className' => 'el-icon-s-goods', 'count' => intval($maker['4-2'] ?? 0), 'name' => '集团会员'),//is_show=2
+                array('className' => 'el-icon-s-goods', 'count' => intval($maker['4-1'] ?? 0), 'name' => '电商创客'),
+                array('className' => 'el-icon-s-goods', 'count' => intval($userByCodeCount['temp'] ?? 0), 'name' => '激活创客'),
+            );
+    
+            if ($mer_id) {
+                $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[4] ?? 0), 'name' => '创客'];
+            }
+            $res['left'][] = $data;
+            $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim(intval($maker['4-2'] ?? 0) + intval($maker['4-1'] ?? 0) + intval($userByCodeCount['temp'] ?? 0)), 'name' => '创客'];
+        }else{
+            $type = input('type', 1);
+            $day = input('day', '');
+    
+            if ($type == 1 and $day != '') {
+                $where .= " and DATE(create_time) = '" . $day . "'";
+            }
+            if ($type == 2 and $day != '') {
+                $date = new \DateTime($day);
+                $year = $date->format('Y');
+                $month = $date->format('m');
+                $where .= " and YEAR(create_time) = " . $year . " AND MONTH(create_time) = " . $month;
+            }
+            $dataQuery = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where {$where} group by user_group");
+            $dataQuery = array_column($dataQuery, 'count', 'user_group');
+    
+            $maker = Db::query("SELECT CONCAT(`user_group`, '-',`is_show`) as k, count(uid) count FROM `rrx_user` where {$where} group by user_group,is_show");
+            $maker = array_column($maker, 'count', 'k');
+    
+    
+            $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[1] ?? 0), 'name' => '消费者'];
+            $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[2] ?? 0), 'name' => '业务员'];
+            $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[3] ?? 0), 'name' => '业务经理'];
+            $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[5] ?? 0), 'name' => '初级合伙人'];
+            $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[6] ?? 0), 'name' => '中级合伙人'];
+    
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[7] ?? 0), 'name' => '高级合伙人'];
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[8] ?? 0), 'name' => '董事'];
+            $maker = Db::query("SELECT count(uid) as count FROM `rrx_user` where {$where} and originator_id_old > 0");
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '联创'];
+            
+            $whereTow = str_replace("uid", "user_id", $where);
+            $maker = Db::query("SELECT count(user_id) as count FROM `rrx_old_user_stock` where {$whereTow}");
+            
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '股权'];
+            $maker = Db::query("SELECT count(uid) as count FROM `rrx_merchant` where {$where}");
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '商户'];
+            $res['left'] = $data;
         }
-        $dataQuery = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where {$where} group by user_group");
-        $dataQuery = array_column($dataQuery, 'count', 'user_group');
-
-        $maker = Db::query("SELECT CONCAT(`user_group`, '-',`is_show`) as k, count(uid) count FROM `rrx_user` where {$where} group by user_group,is_show");
-        $maker = array_column($maker, 'count', 'k');
-
-
-        $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[1] ?? 0), 'name' => '消费者'];
-        $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[2] ?? 0), 'name' => '业务员'];
-        $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[3] ?? 0), 'name' => '业务经理'];
-        $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[5] ?? 0), 'name' => '初级合伙人'];
-        $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[6] ?? 0), 'name' => '中级合伙人'];
-
-        $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[7] ?? 0), 'name' => '高级合伙人'];
-        $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[8] ?? 0), 'name' => '董事'];
-        $maker = Db::query("SELECT count(uid) as count FROM `rrx_user` where {$where} and originator_id_old > 0");
-        $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '联创'];
-        
-        $whereTow = str_replace("uid", "user_id", $where);
-        $maker = Db::query("SELECT count(user_id) as count FROM `rrx_old_user_stock` where {$whereTow}");
-        
-        $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '股权'];
-        $maker = Db::query("SELECT count(uid) as count FROM `rrx_merchant` where {$where}");
-        $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '商户'];
-
-        $res['left'] = $data;
-
         return $res;
     }