Merge branch 'master' of https://git.bjtdba.com/shop/php

app/common/repositories/finance/FinanceRepository.php

@@ -28,98 +28,415 @@ 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";
+        // } 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;
         }
 
+        $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;
+    }
+
+    /**
+     * 用户概况
+     * @param int $mer_id
+     * @return array
+     * @throws \Exception
+     */
+    public function user_overview($mer_id = 0)
+    {
+        $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(pay_time) = '" . $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');
 
-            $where .= " and YEAR(pay_time) = " . $year . " AND MONTH(pay_time) = " . $month;
+        $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[] = ['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' => '董事'];
+
+        $maker = Db::query("SELECT count(uid) as count FROM `rrx_user` where {$where} and originator_id_old > 0");
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '联创'];
+
+        $maker = Db::query("SELECT count(user_id) as count FROM `rrx_old_user_stock` where {$where}");
+        $data[] = ['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[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '商户'];
+
+        $res['left'][] = $data;
+        // $maker = Db::query("SELECT count(uid) as count FROM `rrx_merchant` where {$where}");
+        // $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '创客'];
+
+        return $res;
+    }
+
+
+
+    /**
+     * 会员概况
+     * @param int $mer_id
+     * @return array
+     * @throws \Exception
+     */
+    public function member_overview($mer_id = 0)
+    {
+        $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 . "'";
         }
-        $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');
-//        echo Db::name('store_order')->getLastSql();
-
-        $chengjiaomoney = decimal2($xianshangzhifu + $hongjifenxiaofei);
-        $list1[] = ['count' => set_price_rtrim($xianshangzhifu), 'name' => '线上支付金额'];
-        if (!$mer_id) {
-            $list1[] = ['count' => set_price_rtrim($xianshangzhifu_xuni), 'name' => '虚拟支付金额'];
+        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;
         }
-        $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();
+        $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');
 
-        $chengjiaocount = $xianshangzhifunum + $hongjifenxiaofeinum;
+        $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');
 
-        $list2[] = ['count' => $xianshangzhifunum, 'name' => '线上支付订单量'];
-        if (!$mer_id) {
-            $list2[] = ['count' => $xianshangzhifunum_xuni, 'name' => '虚拟支付订单量'];
+        $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' => '创客'];
         }
-        $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' => '虚拟支付人数'];
+        $res['left'][] = $data;
+        $maker = Db::query("SELECT count(uid) as count FROM `rrx_merchant` where {$where}");
+        $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '创客'];
+
+        return $res;
+    }
+
+
+
+
+    /**
+     * pv概况
+     * @param int $mer_id
+     * @return array
+     * @throws \Exception
+     */
+    public function pv_overview($mer_id = 0)
+    {
+        $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})";
         }
-        $list3[] = ['count' => 0, 'name' => '代付人数'];
+        $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");
 
-        $xianshangtuikuan = Db::name('store_order')->where($where)->where('status', -1)->sum('pay_price');
+        $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');
 
-        $tuikuanmoney = $xianshangtuikuan;
-        $list4 = array(
-            array('count' => $xianshangtuikuan, 'name' => '线上支付退单'),
-            array('count' => 0, 'name' => '代付退单'),
-        );
-        $xianshangzhifutuinum = Db::name('store_order')->where($where)->where('status', -1)->count();
+        $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');
 
-        $tuikuancount = $xianshangzhifutuinum;
-        $list5 = array(
-            array('count' => set_price_rtrim($xianshangzhifutuinum), 'name' => '线上支付退单量'),
-            array('count' => 0, 'name' => '代付退单量'),
+        $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' => '激活创客'),
         );
-        $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' => '代付退单数'),
+        if ($mer_id) {
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[4] ?? 0), 'name' => '创客'];
+        }
+        $res['left'][] = $data;
+        $maker = Db::query("SELECT count(uid) as count FROM `rrx_merchant` where {$where}");
+        $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '创客'];
+
+        return $res;
+    }
+
+
+
+
+    /**
+     * vr概况
+     * @param int $mer_id
+     * @return array
+     * @throws \Exception
+     */
+    public function vr_overview($mer_id = 0)
+    {
+        $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;
+        $maker = Db::query("SELECT count(uid) as count FROM `rrx_merchant` where {$where}");
+        $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['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;
+        return $res;
     }
 
+
+
     /**
-     * 用户概况
+     * 积分概况
      * @param int $mer_id
      * @return array
      * @throws \Exception
      */
-    public function user_overview($mer_id = 0)
+    public function jifen_overview($mer_id = 0)
     {
         $where = "1=1 ";
         if ($mer_id) {
@@ -168,18 +485,17 @@ class FinanceRepository extends BaseRepository
         );
 
         if ($mer_id) {
-//            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($shopPartnerCount), 'name' => '创客合伙人'];
             $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' => '创客'];
-
         $maker = Db::query("SELECT count(uid) as count FROM `rrx_merchant` where {$where}");
         $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '创客'];
 
         return $res;
     }
 
+
+
     public function jieyu($type, $day, $mer_id = 0)
     {
 

app/common/repositories/store/order/StoreOrderRepository.php

@@ -6603,7 +6603,7 @@ class StoreOrderRepository extends BaseRepository
 //        $tuijian_yongjin=bcmul($divisible_commission,$yonghu_tuijian,2);
         $tuijian_yongjin = sprintf("%01.2f", $divisible_commission * $yonghu_tuijian * 0.01);
         if ($tuijian_yongjin > 0.01) {
-            $mark = "用户在储蓄宝消费获得" . $tuijian_yongjin . '佣金';
+            $mark = "用户在幸福宝消费获得" . $tuijian_yongjin . '佣金';
             $title = "佣金";
             $source = 0;
             $commission_type = 3;

app/common/repositories/user/UserRepository.php

@@ -3283,12 +3283,59 @@ class UserRepository extends BaseRepository
 
         // 3、获取个人贡献值
         $userData = $this->dao->get($uid)->toArray();
-        if ($userData['is_old'] == 1 && $userData['user_group'] > 1 && empty($userData['identity_up_time'])) {
-            if (empty($userData['create_time'])) {
-                return $userData['user_group'];
+        // 这一步骤是为了 确定用户升级时间，因为后边的团队贡献值，需要查询 用户 升级为业务员后 所产生的团队贡献值
+        if (empty($userData['identity_up_time'])) {
+            // 老用户的身份 升级时间已无法确定， 则采用用户的创建时间
+            if ($userData['is_old'] == 1 && $userData['user_group'] > 1) {
+                if (empty($userData['create_time'])) {
+                    return $userData['user_group'];
+                }
+                $userData['identity_up_time'] = $userData['create_time'];
+                $this->dao->update($uid, ['identity_up_time' => $userData['identity_up_time']]);
+            }
+            // 如果是新用户 则 根绝他的贡献值记录表 确认成为业务员的时间
+            if ($userData['is_old'] == 0) {
+                $upArriveNumOwn = 0;
+                $yeWuYuanId = 0;
+                foreach ($identityList as $value) {
+                    if ($value['user_group_name'] == '业务员') {
+                        $upArriveNumOwn = $value['arrive_num_own'];
+                        $yeWuYuanId = $value['user_group_id'];
+                        break;
+                    }
+                }
+                if (!empty($upArriveNumOwn)) {
+                    $userSignGongxianList = Db::name('user_sign_gongxian')
+                        ->where('uid', $uid)
+                        ->where('status', 1) // 贡献值状态1-有效 0-失效 -1待确认
+                        ->whereNotNull('settlement_time') // `settlement_time` datetime DEFAULT NULL COMMENT '结算时间',
+                        ->order('id asc')
+                        ->field('uid, number, type, settlement_time') // 只需要下级的uid和贡献值
+                        ->select()
+                        ->toArray();
+                    $myArriveNumOwn = 0;
+                    $myIdentityUpTime = '';
+                    foreach ($userSignGongxianList as $value) {
+                        if ($value['type'] == 1) {
+                            $myArriveNumOwn += $value['number'];
+                        } else {
+                            $myArriveNumOwn -= $value['number'];
+                        }
+                        if ($myArriveNumOwn >= $upArriveNumOwn) {
+                            $myIdentityUpTime = $value['settlement_time'];
+                            break;
+                        }
+                    }
+                    if (!empty($myIdentityUpTime) && !empty($yeWuYuanId)) {
+                        $userData['identity_up_time'] = $userData['create_time'];
+                        $userData['user_group'] = $yeWuYuanId;
+                        $this->dao->update($uid, [
+                            'identity_up_time' => $myIdentityUpTime,
+                            'user_group' => $yeWuYuanId
+                        ]);
+                    }
+                }
             }
-            $userData['identity_up_time'] = $userData['create_time'];
-            $this->dao->update($uid, ['identity_up_time' => $userData['identity_up_time']]);
         }
         if ($userData['user_group'] == 1) {
             $maxLvRestrict = 2;
@@ -3535,4 +3582,112 @@ class UserRepository extends BaseRepository
 
         return $levelContributions;
     }
+
+    public function getUserContributeInfoByDepth($uid, $depth = 10)
+    {
+        // 3、获取个人贡献值
+        $userData = $this->dao->get($uid)->toArray();
+        // 这一步骤是为了 确定用户升级时间，因为后边的团队贡献值，需要查询 用户 升级为业务员后 所产生的团队贡献值
+        if (empty($userData['identity_up_time'])) {
+            // 老用户的身份 升级时间已无法确定， 则采用用户的创建时间
+            if ($userData['is_old'] == 1 && $userData['user_group'] > 1) {
+                if (empty($userData['create_time'])) {
+                    return $userData['user_group'];
+                }
+                $userData['identity_up_time'] = $userData['create_time'];
+                $this->dao->update($uid, ['identity_up_time' => $userData['identity_up_time']]);
+            }
+            // 如果是新用户 则 根绝他的贡献值记录表 确认成为业务员的时间
+            if ($userData['is_old'] == 0) {
+                $upArriveNumOwn = 0;
+                $yeWuYuanId = 0;
+                // 1、获取所有等级信息
+                /** @var UserIdentityRepository $identityRepository */
+                $identityRepository = app()->make(UserIdentityRepository::class);
+                $identityList = $identityRepository->getIdentityList();
+                foreach ($identityList as $value) {
+                    if ($value['user_group_name'] == '业务员') {
+                        $upArriveNumOwn = $value['arrive_num_own'];
+                        $yeWuYuanId = $value['user_group_id'];
+                        break;
+                    }
+                }
+                if (!empty($upArriveNumOwn)) {
+                    $userSignGongxianList = Db::name('user_sign_gongxian')
+                        ->where('uid', $uid)
+                        ->where('status', 1) // 贡献值状态1-有效 0-失效 -1待确认
+                        ->whereNotNull('settlement_time') // `settlement_time` datetime DEFAULT NULL COMMENT '结算时间',
+                        ->order('id asc')
+                        ->field('uid, number, type, settlement_time') // 只需要下级的uid和贡献值
+                        ->select()
+                        ->toArray();
+                    $myArriveNumOwn = 0;
+                    $myIdentityUpTime = '';
+                    foreach ($userSignGongxianList as $value) {
+                        if ($value['type'] == 1) {
+                            $myArriveNumOwn += $value['number'];
+                        } else {
+                            $myArriveNumOwn -= $value['number'];
+                        }
+                        if ($myArriveNumOwn >= $upArriveNumOwn) {
+                            $myIdentityUpTime = $value['settlement_time'];
+                            break;
+                        }
+                    }
+                    if (!empty($myIdentityUpTime) && !empty($yeWuYuanId)) {
+                        $userData['identity_up_time'] = $userData['create_time'];
+                        $userData['user_group'] = $yeWuYuanId;
+                        $this->dao->update($uid, [
+                            'identity_up_time' => $userData['identity_up_time'],
+                            'user_group' => $yeWuYuanId
+                        ]);
+                    }
+                }
+            }
+        }
+
+        // 如果用户身份是  用户  则
+        /**
+         * （1）达标贡献值=自己消费产生的贡献值
+         * （2）团队达标贡献值=小区团队的贡献值（用户的团队贡献值只统计一级）；如果团队只有一人，那团队贡献值就是0
+         */
+        if ($userData['user_group'] == 1) {
+            $depth = 1;
+        }
+
+        // 4、获取下级用户 贡献值
+        $userContributionSumMap = [];
+        // 获取用户的直属下级
+        $uidContributeList = $this->getUidContributeListBySpreadUidList([$uid]);
+        foreach ($uidContributeList as $uidContribute) {
+            // 获取每个下级（部门）的个人贡献值
+            $userContributionSumMap[$uidContribute['uid']] = $this->getContributionSumByLevel(
+                [$uidContribute['uid']],
+                $depth,
+                $userData['is_old'],
+                $userData['identity_up_time'] ?? null
+            );
+            $userContributionSumMap[$uidContribute['uid']][0] = $uidContribute['contribute'];
+            // 假设 老大的 下级是 张三和李四， 董事（最高级身份）需要循环最深的等级是 3 级    得出来的结果↓  这样是为了计算大小部门
+            // $userContributionSumMap[直属下级（部门）张三] =>[0 => 张三个人贡献值, 1 => 张三所有下级用户的个人贡献值, 2 => 张三所有下级用户的下级用户贡献值]
+            // $userContributionSumMap[直属下级（部门）李四] =>[0 => 李四个人贡献值, 1 => 李四所有下级用户的个人贡献值, 2 => 李四所有下级用户的下级用户贡献值]
+        }
+
+        $subordinateContribution = [];
+        foreach ($userContributionSumMap as $key => $value) {
+            $subordinateContribution[$key] = array_sum($value);
+        }
+        $arriveNumTeam = 0;
+        if (!empty($subordinateContribution)) {
+            // 大区业绩
+            $dqYj = max($subordinateContribution);
+            // 总业绩
+            $zYj = array_sum($subordinateContribution);
+            // 小区团体业绩
+            $arriveNumTeam = bcsub($zYj, $dqYj, 2);
+        }
+
+        return ['arriveNumTeam' => $arriveNumTeam, 'contribute' => $userData['contribute'], 'per_contribute' => $userData['per_contribute']];
+
+    }
 }

app/controller/admin/finance/Finance.php

@@ -20,8 +20,9 @@ class Finance extends BaseController
         $data = $financeRepository->order_overview();
         return app('json')->success('ok', $data);
     }
+    
     /**
-     * 订单概况
+     * 用户概况
      * @return mixed
      */
     public function user_overview()
@@ -31,6 +32,92 @@ class Finance extends BaseController
         return app('json')->success('ok', $data);
     }
 
+
+    /**
+     * 会员概况
+     * @return mixed
+     */
+    public function member_overview()
+    {
+        $financeRepository = app()->make(FinanceRepository::class);
+        $data = $financeRepository->member_overview();
+        return app('json')->success('ok', $data);
+    }
+
+
+
+    /**
+     * pv概况
+     * @return mixed
+     */
+    public function pv_overview()
+    {
+        $financeRepository = app()->make(FinanceRepository::class);
+        $data = $financeRepository->pv_overview();
+        return app('json')->success('ok', $data);
+    }
+
+
+    /**
+     * vr概况
+     * @return mixed
+     */
+    public function vr_overview()
+    {
+        $financeRepository = app()->make(FinanceRepository::class);
+        $data = $financeRepository->vr_overview();
+        return app('json')->success('ok', $data);
+    }
+
+
+    /**
+     * 积分概况
+     * @return mixed
+     */
+    public function jifen_overview()
+    {
+        $financeRepository = app()->make(FinanceRepository::class);
+        $data = $financeRepository->jifen_overview();
+        return app('json')->success('ok', $data);
+    }
+
+
+    /**
+     * 交易概况
+     * @return mixed
+     */
+    public function transaction_overview()
+    {
+
+        try {
+            $type = input('type', 1);
+            $day = input('day', '');
+            $mer_id = $this->request->merId();
+    
+            $financeRepository = app()->make(FinanceRepository::class);
+            $arr = $financeRepository->jieyu($type,$day,$mer_id);
+    
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['yingyemoney']), 'name' => '营业总额'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['ruzhang']), 'name' => '入账总额'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['shouyi']), 'name' => '佣金奖励总额'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['jieyu']), 'name' => '结余总额'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['hf_fee_amt']), 'name' => '汇付通道服务费金额'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['integral']), 'name' => '积分总数'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['tixinan']), 'name' => '提现支出总额'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['yanglao']), 'name' => '养老金总额'];
+    
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['gongxian']), 'name' => '贡献值总额'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['jingdou']), 'name' => '京豆总额'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['hongbao']), 'name' => '红包总额'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['fugou']), 'name' => '复购金总额'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['vr']), 'name' => 'VR总额'];
+            return app('json')->success('ok', $data);
+        } catch (\Exception $e) {
+            Db::name('log')->insert(['data' => '交易详情统计错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            return app('json')->fail('统计失败'. $e->getMessage());
+        }
+    }
+
     /**
      * 积分统计
      * @return mixed
@@ -188,41 +275,6 @@ class Finance extends BaseController
         }
     }
 
-    /**
-     * 交易详情
-     * @return mixed
-     */
-    public function transaction_overview()
-    {
-
-        try {
-            $type = input('type', 1);
-            $day = input('day', '');
-            $mer_id = $this->request->merId();
-    
-            $financeRepository = app()->make(FinanceRepository::class);
-            $arr = $financeRepository->jieyu($type,$day,$mer_id);
-    
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['yingyemoney']), 'name' => '营业总额'];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['ruzhang']), 'name' => '入账总额'];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['shouyi']), 'name' => '佣金奖励总额'];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['jieyu']), 'name' => '结余总额'];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['hf_fee_amt']), 'name' => '汇付通道服务费金额'];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['integral']), 'name' => '积分总数'];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['tixinan']), 'name' => '提现支出总额'];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['yanglao']), 'name' => '养老金总额'];
-    
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['gongxian']), 'name' => '贡献值总额'];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['jingdou']), 'name' => '京豆总额'];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['hongbao']), 'name' => '红包总额'];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['fugou']), 'name' => '复购金总额'];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['vr']), 'name' => 'VR总额'];
-            return app('json')->success('ok', $data);
-        } catch (\Exception $e) {
-            Db::name('log')->insert(['data' => '交易详情统计错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
-            return app('json')->fail('统计失败'. $e->getMessage());
-        }
-    }
 
     public function day_bill_list()
     {

app/controller/api/user/User.php

@@ -316,6 +316,19 @@ class User extends BaseController
         log::info("============gongxianinfo");
         $user = $this->request->userInfo();
         if($user->uid>0){
+            $con = DB::name('user')->where('uid', $user->uid)->find();
+            // 先去更新一下用户身份
+            $number = Db::name("system_config_value")->where(["config_key" => "team_commission_recursion_depth"])->value("value");
+            $this->repository->setUserIdentity($user->uid);
+            $result = $this->repository->getUserContributeInfoByDepth($user->uid, $number);
+            $data = [
+                'no_total_source' => Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user->uid)->sum('number'),
+                'team_gongxian_num' => $result['arriveNumTeam'],
+                'zhitui' => $con['per_contribute'],
+                'total_source' => $con['contribute']
+            ];
+            return app('json')->success($data);
+
 
            // $dateObj=DB::name('user_sign_gongxian')->where('uid', $user->uid)->where("status",1)->select();
             $con = DB::name('user')->where('uid', $user->uid)->find();

route/admin.php

@@ -857,6 +857,10 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
         Route::group('finance', function () {
             Route::get('order_overview', '/order_overview');
             Route::get('user_overview', '/user_overview');
+            Route::get('member_overview', '/member_overview');
+            Route::get('pv_overview', '/pv_overview');
+            Route::get('vr_overview', '/vr_overview');
+            Route::get('jifen_overview', '/jifen_overview');
             Route::get('transaction_overview', '/transaction_overview');
             Route::get('user_bill', '/user_bill');
             Route::get('integral_list', '/integral_list');