Merge branch 'master' into huangfamily

app/command/TestTask.php

@@ -251,7 +251,7 @@ class TestTask extends Command
 
                 $resultArray = explode(",", $count[0]['uids']);
                 foreach ($resultArray as $reg_uid) {
-                    //查询储蓄保和上级
+                    //查询幸福宝和上级
                     $reg_user = Db::connect('chuxubao')->query("select * from chuxubao.rrx_user where uid={$reg_uid} and is_del=0")[0] ?? [];
                     if (!$reg_user) {
                         continue;
@@ -281,7 +281,7 @@ class TestTask extends Command
                             Db::name('user')->where('uid', $yihucha_user['uid'])->update(['spread_uid' => $yihucha_spread_user['uid']]);
                         } else if ($yihucha_user['spread_uid'] != $yihucha_spread_user['uid']) {
                             //暂时不作操作
-                            echo "{$reg_user['phone']}已注册，有邀请人并且邀请人不是储蓄保上级 需要注意 储蓄保邀请人{$reg_spread_user['phone']} 一壶茶邀请人{$yihucha_puser['phone']}\r\n";
+                            echo "{$reg_user['phone']}已注册，有邀请人并且邀请人不是幸福宝上级 需要注意 幸福宝邀请人{$reg_spread_user['phone']} 一壶茶邀请人{$yihucha_puser['phone']}\r\n";
                         }
                     }
                 }

app/command/test/ln/ImportUser.php

@@ -13,7 +13,7 @@ class ImportUser extends Command
     protected function configure()
     {
         // 指令配置
-        $this->setName('import_user')->setDescription('导入储蓄保一壶茶会员');
+        $this->setName('import_user')->setDescription('导入幸福宝一壶茶会员');
     }
 
     protected function execute(Input $input, Output $output)

app/command/test/ln/ImportUser2.php

@@ -12,7 +12,7 @@ class ImportUser2 extends Command
 {
     protected function configure()
     {
-        $this->setName('chuxubao')->setDescription('导入储蓄保数据');
+        $this->setName('chuxubao')->setDescription('导入幸福宝数据');
     }
 
     protected function execute(Input $input, Output $output)
@@ -74,7 +74,7 @@ class ImportUser2 extends Command
                     $yihucha_child_user = Db::name('user')->where('phone', $child_user['phone'])->where('is_del', 0)->find();
                     //子级用户信息为空，用父级uid覆盖
                     if (empty($yihucha_child_user['spread_uid'])) {
-                        $logs['step2'] = "一壶茶邀请关系为空, 父级用户uid, {$yihucha_father_user['uid']}, 父级用户手机号, {{$yihucha_father_user['phone']}}, 使用储蓄保邀请关系覆盖";
+                        $logs['step2'] = "一壶茶邀请关系为空, 父级用户uid, {$yihucha_father_user['uid']}, 父级用户手机号, {{$yihucha_father_user['phone']}}, 使用幸福宝邀请关系覆盖";
                         Db::name('user')->where('uid', $yihucha_child_user['uid'])->update(['spread_uid' => $yihucha_father_user['uid']]);
                     } else {
                         $yihucha_child_spread_user = Db::name('user')->where('uid', $yihucha_child_user['spread_uid'])->where('is_del', 0)->find();

app/common.php

@@ -898,20 +898,3 @@ if (!function_exists("is_json")){
     }
 }
 
-
-
-if (!function_exists("roundOptimize")){
-    /**
-     * round公用四舍五入去除
-     * @param $number
-     * @return string
-     */
-    function roundOptimize($amount, $decimals = 2): string
-    {
-        if ($amount > 0) {
-            $factor = pow(10, $decimals);
-            return floor($amount * $factor) / $factor;
-        }
-        return $amount;
-    }
-}

app/common/dao/user/UserDao.php

@@ -264,7 +264,7 @@ class UserDao extends BaseDao
      */
     public function accountByUser($account)
     {
-        return User::getDB()->where('account', $account)->find();
+        return User::getDB()->where('account', $account)->where('is_del', 0)->find();
     }
 
     /**

app/common/repositories/BaseRepository.php

@@ -29,4 +29,13 @@ class BaseRepository
     {
         return call_user_func_array([$this->dao, $name], $arguments);
     }
+
+    public function roundOptimize($amount, $decimals = 2)
+    {
+        if ($amount > 0) {
+            $factor = pow(10, $decimals);
+            return floor($amount * $factor) / $factor;
+        }
+        return $amount;
+    }
 }

app/common/repositories/finance/FinanceRepository.php

@@ -28,98 +28,319 @@ 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['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' => '联创'];
+        $maker = Db::query("SELECT count(user_id) as count FROM `rrx_old_user_stock` where {$where}");
+        $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;
+    }
+
+
+
+    /**
+     * 会员概况
+     * @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");
 
-        $chengjiaocount = $xianshangzhifunum + $hongjifenxiaofeinum;
+        $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');
 
-        $list2[] = ['count' => $xianshangzhifunum, 'name' => '线上支付订单量'];
-        if (!$mer_id) {
-            $list2[] = ['count' => $xianshangzhifunum_xuni, 'name' => '虚拟支付订单量'];
+        $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' => 0, 'name' => '会员总人数'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '今日新增会员'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '被冻结会员数'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员专区总业绩'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员专区上周总业绩'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员专区本周总业绩'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员专区今日总业绩'];
+
+        $res['left'][] = $data;
+        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})";
         }
-        $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' => '虚拟支付人数'];
+        $type = input('type', 1);
+        $day = input('day', '');
+
+        if ($type == 1 and $day != '') {
+            $where .= " and DATE(create_time) = '" . $day . "'";
         }
-        $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;
+        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');
+
+        $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' => 0, 'name' => '平台总PV'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员存量总PV'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '本周新增PV总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '今日新增PV总量'];
+    
+        $res['left'][] = $data;
+        return $res;
     }
 
+
+
+
     /**
-     * 用户概况
+     * vr概况
      * @param int $mer_id
      * @return array
      * @throws \Exception
      */
-    public function user_overview($mer_id = 0)
+    public function vr_overview($mer_id = 0)
     {
         $where = "1=1 ";
         if ($mer_id) {
@@ -146,7 +367,6 @@ class FinanceRepository extends BaseRepository
         }
         $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');
@@ -154,35 +374,78 @@ class FinanceRepository extends BaseRepository
         $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' => '激活创客'),
-        );
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '平台总VR'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员存量总VR'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '本周新增VR总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '今日新增VR总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员消耗总VR'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '本周消耗VR总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '今日消耗VR总量'];
+   
+        $res['left'][] = $data;
+        return $res;
+    }
 
+
+
+    /**
+     * 积分概况
+     * @param int $mer_id
+     * @return array
+     * @throws \Exception
+     */
+    public function jifen_overview($mer_id = 0)
+    {
+        $where = "1=1 ";
         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' => '创客'];
+            $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})";
         }
-        $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' => '创客'];
+        $type = input('type', 1);
+        $day = input('day', '');
 
-        $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' => '创客'];
+        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');
+
+        $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' => 0, 'name' => '平台总积分'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员存量总积分'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '本周新增积分总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '今日新增积分总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员消耗总积分'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '本周消耗积分总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '今日消耗积分总量'];
+
+
+        $res['left'][] = $data;
 
         return $res;
     }
 
+
+
     public function jieyu($type, $day, $mer_id = 0)
     {
-
         if ($mer_id) {
             $uid = Db::name('merchant')->where('mer_id', $mer_id)->value('uid');
             $where = "mer_id = " . $mer_id . " and paid = 1";
@@ -272,7 +535,15 @@ class FinanceRepository extends BaseRepository
             $vr = Db::name('user_sign_vr')
                 ->whereBetween('settlement_time', [date('Y-m-d H:i:s', strtotime($day)), date('Y-m-d H:i:s', strtotime($day) + 24 * 3600)])
                 ->sum('number');
+            
+            $suoke = Db::name('user_bill')
+            ->where('commission_type', 7)
+            ->whereBetween('create_time', [date('Y-m-d H:i:s', strtotime($day)), date('Y-m-d H:i:s', strtotime($day) + 24 * 3600)])
+            ->sum('number');
 
+            $pv = Db::name('user_pv_log')
+            ->whereBetween('settlement_time', [date('Y-m-d H:i:s', strtotime($day)), date('Y-m-d H:i:s', strtotime($day) + 24 * 3600)])
+            ->sum('pv');
 
         } else if ($type == 2 and $day != '') {
             $date = new \DateTime($day);
@@ -355,6 +626,15 @@ class FinanceRepository extends BaseRepository
                 ->whereBetween('settlement_time', [date('Y-m-01 00:00:00', strtotime($year)), date('Y-m-d H:i:s', strtotime($lastDay) + 24 * 3600)])
                 ->sum('number');
 
+            $suoke = Db::name('user_bill')
+            ->where('commission_type', 7)
+            ->whereBetween('create_time', [date('Y-m-01 00:00:00', strtotime($year)), date('Y-m-d H:i:s', strtotime($lastDay) + 24 * 3600)])
+            ->sum('number');
+
+            $pv = Db::name('user_pv_log')
+            ->whereBetween('settlement_time', [date('Y-m-01 00:00:00', strtotime($year)), date('Y-m-d H:i:s', strtotime($lastDay) + 24 * 3600)])
+            ->sum('pv');
+
         } else {
             $ruzhang = Db::name('enterprise_platform_income_detail')->where("deal_time <'" . date('Y-m-d H:i:s') . "'")
                 ->when($mer_id, function ($query) use ($mer_id) {
@@ -415,14 +695,20 @@ class FinanceRepository extends BaseRepository
 
             $vr = Db::name('user_sign_vr')
             ->sum('number');
+
+            $suoke = Db::name('user_bill')
+            ->where('commission_type', 7)
+            ->sum('number');
+
+            $pv = Db::name('user_pv_log')
+            ->sum('pv');
         }
 
 
         $yingyemoney = Db::name('store_order')->where($where)->sum('pay_price');
         $hf_fee_amt = Db::name('store_order')->where($where_order)->sum('hf_fee_amt');//汇付手续费
 
-        return compact('yingyemoney', 'hf_fee_amt', 'my_money', 'tixinan', 'ruzhang', 'shouyi', 'jieyu', 'integral', 'yanglao', 'gongxian', 'jingdou', 'hongbao', 'fugou', 'vr');
-
+        return compact('yingyemoney', 'hf_fee_amt', 'my_money', 'tixinan', 'ruzhang', 'shouyi', 'jieyu', 'integral', 'yanglao', 'gongxian', 'jingdou', 'hongbao', 'fugou', 'vr', 'suoke', 'pv');
     }
 
     /**

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -1664,7 +1664,7 @@ class OrderMerchantRepository extends BaseRepository
 
         //商户得到的(京豆和贡献值奖励的倍，后台设置)
         $jd = bcmul($divisible_commission, $mer_jd, 2);
-        if ($jd >= 0.01) {
+        if ($jd >= 0.01) {  
             $jd_data = [
                 "uid"           =>$mer_data["uid"],
                 "mer_id"        =>$order["mer_id"],

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

@@ -3827,7 +3827,7 @@ class StoreOrderRepository extends BaseRepository
             $yongjin = $pvfee * $yongjinbili / 100;
 
             // 佣金百分之90进入佣金池  佣金百分之10进入复购金
-            $tuiguanyongjin = roundOptimize($yongjin * 0.9, 2);
+            $tuiguanyongjin = $this->roundOptimize($yongjin * 0.9, 2);
             $tuiguanfugou = $yongjin;//复购金赠送函数里面有计算百分之10
 
             //end会费
@@ -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;
@@ -7688,7 +7688,7 @@ class StoreOrderRepository extends BaseRepository
         $insterAll = array(
             'money' => $amount_queshao,
             'member_id' => '',
-            'mark' => '一壶茶应得 (' . set_price_rtrim(decimal2($amount_queshao + $amount_yihucha)) . ') 实得(' . set_price_rtrim($amount_yihucha) . ') 给了储蓄保(' . set_price_rtrim($amount_queshao) . ')',
+            'mark' => '一壶茶应得 (' . set_price_rtrim(decimal2($amount_queshao + $amount_yihucha)) . ') 实得(' . set_price_rtrim($amount_yihucha) . ') 给了幸福宝(' . set_price_rtrim($amount_queshao) . ')',
             'order_id' => $order_id
         );
 
@@ -8594,8 +8594,8 @@ class StoreOrderRepository extends BaseRepository
                 $_order = [
                     'commission_rate' => (float)$merchantRepository->get($cartInfo['mer_id'])->mer_commission_rate,
                     'order_type' => in_array($cartInfo['mer_id'], $takes) == 1 ? 1 : 0,
-                    'extension_one' => 0,
-                    'extension_two' => 0,
+                    'extension_one' => $cartInfo['list'][0]['productAttr']['extension_one'] ?? 0,
+                    'extension_two' => $cartInfo['list'][0]['productAttr']['extension_two'] ?? 0,
                     'orderInfo' => $cartInfo['order'],
                     'cartInfo' => $cartInfo['list'],
                     'order_sn' => $this->getNewOrderId() . ($k + 1),
@@ -9306,7 +9306,9 @@ class StoreOrderRepository extends BaseRepository
         ];
         // 当状态为1时是实时结算
         if($status == 1) {
-            Db::name('user')->where('uid', $uid)->inc('pv', (float)$pv)->update();
+            // Db::name('user')->where('uid', $uid)->inc('pv', (float)$pv)->update();
+            $con_data = Db::name('user')->where("uid", $uid)->find();
+            Db::name('user')->where("uid", $uid)->update(['pv' => ($con_data['pv']?:0) + $pv]);
             $pv_data['settlement_time'] = date('Y-m-d H:i:s');
         }
         Db::name("user_pv_log")->insert($pv_data);//添加pv记录
@@ -9646,7 +9648,7 @@ class StoreOrderRepository extends BaseRepository
 
                         //推广养老金
                         //推广佣金
-                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                         // 贡献值
                         $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广精彩生活商品赠送贡献值");
                         //积分
@@ -9663,7 +9665,7 @@ class StoreOrderRepository extends BaseRepository
                         //积分
                         $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 11, "推广精彩生活区商品赠送积分");
                         // //推广佣金
-                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                         //养老金
                         $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '推广获得养老金' . bcmul($pv, 0.05, 2), $store_order_data['mer_id'], 0);
                     }
@@ -9678,7 +9680,7 @@ class StoreOrderRepository extends BaseRepository
                         $yj_amount_90 = bcmul($pv * 0.9, 0.05, 2);
                         $fgj_amount_10 = bcmul($pv * 0.1, 0.05, 2);//推广者的佣金抽10%到个人复购金
                         //推广佣金
-                        $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                     }
                 }
             }
@@ -9753,7 +9755,7 @@ class StoreOrderRepository extends BaseRepository
                 //养老金
                 $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
                 //佣金
-                $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id']);
+                $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id']);
                 //复购金
                 $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
             }
@@ -9766,7 +9768,7 @@ class StoreOrderRepository extends BaseRepository
                 $this->con_log($spread_data['uid'], bcmul($gx_jf, 0.3, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
                 $this->score_log($spread_data['uid'], bcmul($gx_jf, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
                 //推广佣金
-                $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id']);
+                $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id']);
             }
 
             if ($spread_data_old != 0) {
@@ -9780,7 +9782,7 @@ class StoreOrderRepository extends BaseRepository
                 //养老金
                 $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . bcmul($pv, 0.035, 2), $store_order_data['mer_id']);
                 //佣金
-                $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id']);
+                $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id']);
                 //复购金
                 $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
 
@@ -9804,7 +9806,7 @@ class StoreOrderRepository extends BaseRepository
                     $fgj_amount_10 = bcmul($pv, 0.035, 2) * 0.1;//推广者的佣金抽10%到个人复购金
                     $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
                     //推广佣金
-                    $this->bill_user_log($merchant_data['uid'], bcmul($pv, 0.35, 2), $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . round($pv * 0.35, 2), $store_order_data['mer_id']);
+                    $this->bill_user_log($merchant_data['uid'], bcmul($pv, 0.35, 2), $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id']);
                 }
             }
 
@@ -9877,7 +9879,7 @@ class StoreOrderRepository extends BaseRepository
                         //积分
                         $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 12, "推广商贸区商品赠送积分");
                         //推广佣金
-                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                         //养老金
                         $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $group_order['group_order_sn'], '推广获得养老金' . round($pv * 0.05, 2), $store_order_data['mer_id'], 0);
                     }
@@ -9892,7 +9894,7 @@ class StoreOrderRepository extends BaseRepository
                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
                         //推广佣金
-                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                         // 贡献值
                         $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "推广商贸区商品赠送贡献值");
                         // 积分
@@ -9910,11 +9912,11 @@ class StoreOrderRepository extends BaseRepository
                         $fgj_amount_10 = bcmul($pv * 0.1, 0.05, 2);//推广者的佣金抽10%到个人复购金
                         $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
                         //推广佣金
-                        $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                        $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                     }
                     /** @var OrderMerchantRepository $orderMerchantRepository */
                     $orderMerchantRepository = app()->make(OrderMerchantRepository::class);
-                    $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_order_data['extension_two']);
+                    $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_order_data['extension_one']);
 
                     //商户获得贡献值  ---- 3月29日  商户不再获得贡献值 改为获得分润值
 //                    if ($concession_pri >= 0.01) {
@@ -9939,8 +9941,8 @@ class StoreOrderRepository extends BaseRepository
 //                    }
 
                     //商户获得京豆
-                    if ($concession_pri >= 0.01) {
-                        $jd = bcmul($concession_pri, $jdAndGonxianConfig['jd'], 2);
+                    $jd = bcmul($concession_pri, $jdAndGonxianConfig['jd'], 2);
+                    if ($jd >= 0.01) {
                         $jd_data = [
                             "uid" => $merchant_data["uid"],
                             "mer_id" => $user_data['mer_id'],
@@ -9949,7 +9951,7 @@ class StoreOrderRepository extends BaseRepository
                             "status" => -1,
                             "order_type" => 2,
                             "order_id" => $store_order_data['order_id'],
-                            "mark" => "锁客商家获得京豆",
+                            "mark" => "线上用户消费商家获得京豆",
                             "desc" => '',
                             "surplus" => $jd,
                             "type" => 1

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

@@ -342,8 +342,9 @@ class StoreRefundOrderRepository extends BaseRepository
      * @author Qinii
      * @day 2020-06-12
      */
-    public function getList(array $where, int $page, int $limit)
+    public function getList(array $where, int $page, int $limit,$status)
     {
+        if($status == 2) $where['status'] = '1,2';
         $query = $this->dao->search($where)->where('is_system_del', 0)->with(['order' => function ($query) {
             $query->field('order_id,order_sn,douhuomall');
         }, 'refundProduct.product', 'user' => function ($query) {
@@ -356,7 +357,7 @@ class StoreRefundOrderRepository extends BaseRepository
             'audit' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => 0]),
             'refuse' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => -1]),
             'agree' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => 1]),
-            'backgood' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => 2]),
+            'backgood' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => '1,2']),
             'end' => $this->dao->getWhereCount(['is_system_del' => 0, 'mer_id' => $where['mer_id'], 'status' => 3]),
 
 
@@ -1573,5 +1574,10 @@ class StoreRefundOrderRepository extends BaseRepository
             ->where('order_id', $orderId)
             ->where('status', -1)
             ->update(['status' => 0]);
+
+        Db::name("user_sign_jingdou")
+            ->where('order_id', $orderId)
+            ->where('status', -1)
+            ->update(['status' => 0]);
     }
 }

app/common/repositories/store/product/ProductRepository.php

@@ -1081,7 +1081,7 @@ class ProductRepository extends BaseRepository
 
 
         $productDetails = array(
-            'name'     => $product ?? "储蓄保",//商品名称。需传递真实产品名称。
+            'name'     => $product ?? "幸福宝",//商品名称。需传递真实产品名称。
             'quantity' => 1,//商品数量
             'amount'   => strval($price * 100),//商品单价
         );

app/common/repositories/user/UserExtractRepository.php

@@ -370,22 +370,6 @@ class UserExtractRepository extends BaseRepository
                 }
 
                 $user->save();
-
-                if($type == 3){
-                    //加入红包提现记录
-                   $insertdata = [
-                       'uid'=> $uid,
-                       'number' =>  $data['extract_price'],
-                       'surplus' => $user->hongbao,
-                       'mark' => '红包提现',
-                       'type' => 2,
-                       'status' => -1,
-                       'addtime' => time(),
-                   ];
-                   Db::name('user_sign_hongbao')->insertGetId($insertdata);
-               }
-
-
                 $service_money=bcmul($data['extract_price'],'0.1',2);
                 $data['service_money']=$service_money;
                 $data['status'] = 0;
@@ -427,22 +411,6 @@ class UserExtractRepository extends BaseRepository
                     }
                 }
 
-
-                if($type == 3){
-                     //加入红包提现记录
-                    $insertdata = [
-                        'uid'=> $uid,
-                        'number' =>  $data['extract_price'],
-                        'surplus' => $user->hongbao,
-                        'mark' => '红包提现',
-                        'type' => 2,
-                        'status' => -1,
-                        'addtime' => time(),
-                    ];
-                    Db::name('user_sign_hongbao')->insertGetId($insertdata);
-                }
-
-
 //                    if($extract_price_yihu>0){
                 $insertAll[]=array(
                     'extract_id'=>$extract->extract_id,
@@ -451,7 +419,7 @@ class UserExtractRepository extends BaseRepository
                     'extract_price'=> $extract_price_yihu,
                     'service_money'=> $service_money_yihu,
                     'order_sn'=> $data['order_sn'],
-                    'type'=> 1,//0- 储蓄保 1-一壶茶
+                    'type'=> 1,//0- 幸福宝 1-一壶茶
                 );
 //                    }
                 $insertAll[]=array(
@@ -461,7 +429,7 @@ class UserExtractRepository extends BaseRepository
                     'extract_price'=> ($data['extract_price']-$extract_price_yihu),
                     'service_money'=> ($data['service_money']-$service_money_yihu),
                     'order_sn'=> $data['order_sn'],
-                    'type'=> 0,//0- 储蓄保 1-一壶茶
+                    'type'=> 0,//0- 幸福宝 1-一壶茶
                 );
                 DB::name('user_extract_item')->insertAll($insertAll);
 
@@ -498,9 +466,9 @@ class UserExtractRepository extends BaseRepository
     {
 
         Db::transaction(function()use($id,$data){
+            $extract = $this->dao->getWhere(['extract_id' => $id]);
+            $user = app()->make(UserRepository::class)->get($extract['uid']);
             if($data['status'] == '-1'){
-                $extract = $this->dao->getWhere(['extract_id' => $id]);
-                $user = app()->make(UserRepository::class)->get($extract['uid']);
                 if (!empty($extract['mer_id'])) {
                     //商户提现逻辑处理
                     $mer = app()->make(MerchantRepository::class)->get($extract['mer_id']);
@@ -510,22 +478,30 @@ class UserExtractRepository extends BaseRepository
                 } else {
                     //用户提现逻辑处理
                     if($extract['types']==1){
-                        $brokerage_price = bcadd($user['brokerage_price'] ,$extract['extract_price'],2);
-                        //返回余额
-                        $user->brokerage_price = $brokerage_price;
+                        if($extract['type']==3){
+                            $user->hongbao = bcadd($user->hongbao,$extract['extract_price'],2);
+                        }else {
+                            $brokerage_price = bcadd($user['brokerage_price'] ,$extract['extract_price'],2);
+                            //返回余额
+                            $user->brokerage_price = $brokerage_price;
+                        }
                     }else{
-                        $member_brokerage_price = bcadd($user['member_brokerage_price'] ,$extract['extract_price'],2);
-                        //返回余额
-                        $user->member_brokerage_price = $member_brokerage_price;
-                        Db::name('user_rich')->where('uid',$extract['uid'])->inc('red', $extract['extract_price'])->update();
-                        Db::name('user_rich_log')->insert([
-                            'uid'      => $extract['uid'],
-                            'red'      => $extract['extract_price'],
-                            'pm'       => 1,
-                            'time'     => time(),
-                            'order_id' => 0,
-                            'mark'     => '提现失败返还红积分'
-                        ]);
+                        if($extract['type']==3){
+                            $user->hongbao = bcadd($user->hongbao,$extract['extract_price'],2);
+                        }else{
+                            $member_brokerage_price = bcadd($user['member_brokerage_price'] ,$extract['extract_price'],2);
+                            //返回余额
+                            $user->member_brokerage_price = $member_brokerage_price;
+                            Db::name('user_rich')->where('uid',$extract['uid'])->inc('red', $extract['extract_price'])->update();
+                            Db::name('user_rich_log')->insert([
+                                'uid'      => $extract['uid'],
+                                'red'      => $extract['extract_price'],
+                                'pm'       => 1,
+                                'time'     => time(),
+                                'order_id' => 0,
+                                'mark'     => '提现失败返还红积分'
+                            ]);
+                        }
                     }
                     $user->save();
                 }
@@ -534,6 +510,19 @@ class UserExtractRepository extends BaseRepository
 //                $user->save();
 //                Db::name('user_sign_score')->where("order_type","extract") -> where("order_id",$id) -> update(['status'=>0]);
             }else{
+                if($extract['type']==3){
+                    //加入红包出账记录
+                    $insertdata = [
+                        'uid'=> $user->uid,
+                        'number' =>  $extract['extract_price'],
+                        'surplus' => $user->hongbao,
+                        'mark' => '红包提现',
+                        'type' => 2,
+                        'status' => 1,
+                        'addtime' => time(),
+                    ];
+                    Db::name('user_sign_hongbao')->insertGetId($insertdata);
+                }
                 //积分扣除
 //                Db::name('user_sign_score')->where("order_type","extract") -> where("order_id",$id) -> update(['status'=>1]);
             }
@@ -908,11 +897,11 @@ class UserExtractRepository extends BaseRepository
             $aop->isCheckAlipayPublicCert = true;
             $order_title='提现';
             if($userdata['withdrawal_type']==1){
-                $order_title='储蓄保提现';
+                $order_title='幸福宝提现';
                 $userdata['extract_price']=bcsub($userdata['extract_price'],$userdata['service_money']);
             }elseif($userdata['withdrawal_type']==2){
                 $mer_name=Db::name('merchant')->where('mer_id',$userdata['mer_id'])->value('mer_name');
-                $order_title='储蓄保-'.$mer_name.'提现';
+                $order_title='幸福宝-'.$mer_name.'提现';
                 $userdata['extract_price']=bcsub($userdata['extract_price'],$userdata['service_money']);
             }
 //            Db::name('log')->insert(['data'=>'AopCertClient']);

app/common/repositories/user/UserRepository.php

@@ -2377,11 +2377,11 @@ class UserRepository extends BaseRepository
 
                 if($v['source'] == 0){
                     if($v['commission_type'] == 9){
-                        $this -> getContent('channel_order',$v['order_sn'],'储蓄保',$v['status'],$v['commission_type'],$v);
+                        $this -> getContent('channel_order',$v['order_sn'],'幸福宝',$v['status'],$v['commission_type'],$v);
                     }elseif($v['commission_type'] == 10){
-                        $this -> getContent('merchant_annual_cost_order',$v['order_sn'],'储蓄保',$v['status'],$v['commission_type'],$v);
+                        $this -> getContent('merchant_annual_cost_order',$v['order_sn'],'幸福宝',$v['status'],$v['commission_type'],$v);
                     }else{
-                        $this -> getContent('store_order',$v['order_sn'],'储蓄保',$v['status'],$v['commission_type'],$v,$v['create_time']);
+                        $this -> getContent('store_order',$v['order_sn'],'幸福宝',$v['status'],$v['commission_type'],$v,$v['create_time']);
                     }
                 }else{
                     $uid=Db::name("store_order")->where("order_sn",$v["order_sn"])->value("uid");
@@ -2492,7 +2492,7 @@ class UserRepository extends BaseRepository
     }
     public function get_yanglao($member_id){
 
-       
+
         $data = Db::name("user")
             ->where("uid",$member_id)
             ->field("wechat_user_id,card_id,ali_user_id,annuity_frozen,annuity_num,annuity,create_time,birthday,birthday60,card_number,annuity_yiqu,pay_price")
@@ -2553,7 +2553,7 @@ class UserRepository extends BaseRepository
 //        $data["yinghang"]='https://app.bjtdba.com/uploads/def/20201021/8cb66944101287b8ac9c9b9fb1b13a79.png';
         $data["add_up"] = 0.00;
 
-     
+
 
         return $data;
     }
@@ -2587,7 +2587,7 @@ class UserRepository extends BaseRepository
 
         return $age;
     }
-    public function yanglaolog($where,$page=1, $limit=10,$month=''){
+    public function yanglaolog($where,$page=1, $limit=10,$month='',$is_shixiao = 0){
         $where1 = [];
         if(!empty($where)){
             foreach($where as $key => $value){
@@ -2602,7 +2602,10 @@ class UserRepository extends BaseRepository
             ->when($month!='',function ($q) use ($month){
                 $q->whereLike('a.create_time',$month.'%');
             });
-        $query -> where('a.status','<>','-1');
+
+        if($is_shixiao == 0){
+            $query -> where('a.status','<>','-1');
+        }
         $query_sql1 = clone $query;
         $query_sql2 = clone $query;
         $query_sql3 = clone $query;
@@ -2664,7 +2667,7 @@ class UserRepository extends BaseRepository
                     $v['title']='人工减少佣金';
                 }
             }else{
-                $v['title']='储蓄保-佣金提现';
+                $v['title']='幸福宝-佣金提现';
             }
             if($v['bank_info']!=''){
                 $bank_info=json_decode($v['bank_info'],true);
@@ -2700,7 +2703,7 @@ class UserRepository extends BaseRepository
                     $v['title']='人工减少佣金';
                 }
             }else{
-                $v['title']='储蓄保-佣金提现';
+                $v['title']='幸福宝-佣金提现';
             }
             if($v['bank_info']!=''){
                 $bank_info=json_decode($v['bank_info'],true);
@@ -3270,9 +3273,9 @@ class UserRepository extends BaseRepository
         $lowerLevelNumMin = min($lowerLevelNumList);
         // 获取需要 递归最深的层数，比如 高级合伙人需要递归10层 普通用户需要递归一层
         $needLower = 0;
-        // 0 代表要递归无限极
-        if($lowerLevelNumMax > 0) {
-            $needLower = $lowerLevelNumMin - 1;
+        // 0 代表要递归无限极 -1 代表一级也不查
+        if($lowerLevelNumMin > 0) {
+            $needLower = $lowerLevelNumMax;
         }
         // 最大等级限制
         $maxLvRestrict = 0;
@@ -3280,34 +3283,21 @@ 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'];
-            }
-            $userData['identity_up_time'] = $userData['create_time'];
-            $this->dao->update($uid, ['identity_up_time' => $userData['identity_up_time']]);
-        }
-        if ($userData['user_group'] == 1) {
+        // 这一步骤是为了 确定用户升级时间，因为后边的团队贡献值，需要查询 用户 升级为业务员后 所产生的团队贡献值
+        $determineResult = $this->determineUserUpgradeTime($uid);
+        $userData['user_group'] = $determineResult['user_group'];
+        $userData['identity_up_time'] = $determineResult['identity_up_time'];
+        $startTime = $userData['identity_up_time'];
+        $endTime = date('Y-m-d H:i:s');
+
+        // 如果用户身份 为 用户 或者 升级成业务员的时间为空 则无法计算它的团队贡献值
+        if ($userData['user_group'] == 1 || empty($startTime)) {
             $maxLvRestrict = 2;
+            $needLower = -1;
         }
 
         // 4、获取下级用户 贡献值
-        $userContributionSumMap = [];
-        // 获取用户的直属下级
-        $uidContributeList = $this->getUidContributeListBySpreadUidList([$uid]);
-        foreach ($uidContributeList as $uidContribute) {
-            // 获取每个下级（部门）的个人贡献值
-            $userContributionSumMap[$uidContribute['uid']] = $this->getContributionSumByLevel(
-                [$uidContribute['uid']],
-                $needLower,
-                $userData['is_old'],
-                $userData['identity_up_time'] ?? null
-            );
-            $userContributionSumMap[$uidContribute['uid']][0] = $uidContribute['contribute'];
-            // 假设 老大的 下级是 张三和李四， 董事（最高级身份）需要循环最深的等级是 3 级    得出来的结果↓  这样是为了计算大小部门
-            // $userContributionSumMap[直属下级（部门）张三] =>[0 => 张三个人贡献值, 1 => 张三所有下级用户的个人贡献值, 2 => 张三所有下级用户的下级用户贡献值]
-            // $userContributionSumMap[直属下级（部门）李四] =>[0 => 李四个人贡献值, 1 => 李四所有下级用户的个人贡献值, 2 => 李四所有下级用户的下级用户贡献值]
-        }
+        $userContributionSumMap = $this->getSubordinateContributeByUid($uid, $startTime, $endTime, $needLower);
 
         // 5、将用户等级由低到高
         usort($identityList, function ($a, $b) {
@@ -3330,8 +3320,6 @@ class UserRepository extends BaseRepository
                         foreach ($value as $k => $v) {
                             if ($k < $lowerLevelNum) {
                                 $subordinateContribution[$key] += $v;
-                            } else {
-                                break;
                             }
                         }
                     } else {
@@ -3365,6 +3353,11 @@ class UserRepository extends BaseRepository
 
     /**
      * 获取该会员的所有下级会员
+     * @param array $uidList
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      */
     public function getUidContributeListBySpreadUidList(array $uidList)
     {
@@ -3384,14 +3377,15 @@ class UserRepository extends BaseRepository
      *                      1 表示只计算第1层（直接下级）的总贡献。
      *                      N 表示计算到第 N 层（包含第N层）的总贡献。
      * @param int $is_old
-     * @param null $identity_up_time
+     * @param null $startTime
+     * @param null $endTime
      * @return array 返回一个数组，键是层级号（从1开始），值是该层级所有用户的贡献值总和。
      *               例如：[ 1 => 600, 2 => 1300 ]
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
      */
-    public function getContributionSumByLevel(array $initialUserIds, int $maxDepth = 0, $is_old = 0, $identity_up_time = null): array
+    public function getContributionSumByLevel(array $initialUserIds, int $maxDepth = 0, $is_old = 0, $startTime = null, $endTime = null): array
     {
         $levelContributions = []; // 结果数组 [level => total_contribution]
         if (empty($initialUserIds)) {
@@ -3432,57 +3426,52 @@ class UserRepository extends BaseRepository
                 break;
             }
 
-            $subordinatesOfCurrentLevelUidList =[];
-            foreach ($subordinatesOfCurrentLevel as &$value){
-                $subordinatesOfCurrentLevelUidList[$value['uid']] = 0;
-                $value['contribute'] = 0;
-            }
-
-            // 如果 传入 $identity_up_time 不为空 证明当前在 确定身份的 用户已经是 业务员了
-            if (!empty($identity_up_time)) {
-                // 用户有贡献值记录，我们要根据 用户的身份 从普通消费者 升级 成业务员 的时间来 查询时间范围内产生的贡献值
-                $userSignGongxianList = Db::name('user_sign_gongxian')
-                    ->whereIn('uid', array_keys($subordinatesOfCurrentLevelUidList))
-                    ->where('addtime', '>=', strtotime($identity_up_time)) //   `addtime` int(10) NOT NULL COMMENT '添加时间'
-                    ->where('status', 1) // 贡献值状态1-有效 0-失效 -1待确认
-                    ->whereNotNull('settlement_time') // `settlement_time` datetime DEFAULT NULL COMMENT '结算时间',
-                    ->field('uid, number, type') // 只需要下级的uid和贡献值
-                    ->select()
-                    ->toArray();
-                foreach ($userSignGongxianList as $value) {
-                    if($value['type'] == 1) {
-                        $subordinatesOfCurrentLevelUidList[$value['uid']] += $value['number'];
-                    } else {
-                        $subordinatesOfCurrentLevelUidList[$value['uid']] -= $value['number'];
-                    }
-                }
-
-                if ($is_old == 1) {
-                    // 如果是老用户，除了通过贡献值记录表  还要计算 老订单 产生的贡献值
-                    $oldUserOfGoodsList = Db::name('old_user_of_goods')
-                        ->whereIn('user_id', array_keys($subordinatesOfCurrentLevelUidList))
-                        ->where('create_time', '>=', strtotime($identity_up_time)) //   `addtime` int(10) NOT NULL COMMENT '添加时间'
-                        ->where('status', 1) // '是否完成 0, 未完成 1 已完成',
-                        ->field('user_id, money, status, create_time') // 只需要下级的uid和贡献值
-                        ->select()
-                        ->toArray();
-
-                    foreach ($oldUserOfGoodsList as $storeProductData) {
-                        if ($storeProductData['money'] == 1180) {
-                            $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 700;
-                        } else if ($storeProductData['money'] == 10620) {
-                            $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 6300;
-                        } else if ($storeProductData['money'] == 11800) {
-                            $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 7000;
-                        } else if ($storeProductData['money'] == 9440) {
-                            $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 5600;
-                        } else if ($storeProductData['money'] == 2360) {
-                            $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 1400;
-                        } else {
-                            $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += bcmul($storeProductData['money'], 0.7, 2);
-                        }
-                    }
-                }
+            // 如果 传入 $startTime 不为空 证明当前在 确定身份的 用户已经是 业务员了
+            if (!empty($startTime)) {
+                $subordinatesOfCurrentLevelUidList = $this->getUserContributeByUidList(array_column($subordinatesOfCurrentLevel, 'uid'), $startTime, $endTime);
+                // // 用户有贡献值记录，我们要根据 用户的身份 从普通消费者 升级 成业务员 的时间来 查询时间范围内产生的贡献值
+                // $userSignGongxianList = Db::name('user_sign_gongxian')
+                //     ->whereIn('uid', array_keys($subordinatesOfCurrentLevelUidList))
+                //     ->where('addtime', '>=', strtotime($startTime)) //   `addtime` int(10) NOT NULL COMMENT '添加时间'
+                //     ->where('status', 1) // 贡献值状态1-有效 0-失效 -1待确认
+                //     ->whereNotNull('settlement_time') // `settlement_time` datetime DEFAULT NULL COMMENT '结算时间',
+                //     ->field('uid, number, type') // 只需要下级的uid和贡献值
+                //     ->select()
+                //     ->toArray();
+                // foreach ($userSignGongxianList as $value) {
+                //     if($value['type'] == 1) {
+                //         $subordinatesOfCurrentLevelUidList[$value['uid']] += $value['number'];
+                //     } else {
+                //         $subordinatesOfCurrentLevelUidList[$value['uid']] -= $value['number'];
+                //     }
+                // }
+                //
+                // if ($is_old == 1) {
+                //     // 如果是老用户，除了通过贡献值记录表  还要计算 老订单 产生的贡献值
+                //     $oldUserOfGoodsList = Db::name('old_user_of_goods')
+                //         ->whereIn('user_id', array_keys($subordinatesOfCurrentLevelUidList))
+                //         ->where('create_time', '>=', strtotime($startTime)) //   `addtime` int(10) NOT NULL COMMENT '添加时间'
+                //         ->where('status', 1) // '是否完成 0, 未完成 1 已完成',
+                //         ->field('user_id, money, status, create_time') // 只需要下级的uid和贡献值
+                //         ->select()
+                //         ->toArray();
+                //
+                //     foreach ($oldUserOfGoodsList as $storeProductData) {
+                //         if ($storeProductData['money'] == 1180) {
+                //             $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 700;
+                //         } else if ($storeProductData['money'] == 10620) {
+                //             $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 6300;
+                //         } else if ($storeProductData['money'] == 11800) {
+                //             $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 7000;
+                //         } else if ($storeProductData['money'] == 9440) {
+                //             $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 5600;
+                //         } else if ($storeProductData['money'] == 2360) {
+                //             $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += 1400;
+                //         } else {
+                //             $subordinatesOfCurrentLevelUidList[$storeProductData['user_id']] += bcmul($storeProductData['money'], 0.7, 2);
+                //         }
+                //     }
+                // }
             } else {
                 // 如果传入的 $identity_up_time 为空，说明该用户只是一个普通用户（消费者），没有团队业绩
                 break;
@@ -3532,4 +3521,298 @@ class UserRepository extends BaseRepository
 
         return $levelContributions;
     }
+
+
+    /**
+     * 获取用户 历史的 个人贡献值记录
+     * @param $uidList
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getUserContributeTimeMapByUidList($uidList) {
+        $userContributeTimeMap = [];
+        $userSignGongxianList = Db::name('user_sign_gongxian')
+            ->whereIn('uid', $uidList)
+            ->where('status', 1) // 贡献值状态1-有效 0-失效 -1待确认
+            ->whereNotNull('settlement_time') // `settlement_time` datetime DEFAULT NULL COMMENT '结算时间',
+            ->field('uid, number, type, mark, settlement_time') // 只需要下级的uid和贡献值
+            ->select()
+            ->toArray();
+        foreach ($userSignGongxianList as $value) {
+            // 贡献表中 包含多种类型的 贡献值记录，比如 用户消费商家获得赠送贡献值 , 推广获得的贡献值（直推），这些都不能算是 用户的 直接贡献值
+            // 只有 用户取消费 比如：购买 ** 商品、扫码消费获得赠送贡献值 等 才算做个人贡献值
+            if (strpos($value['mark'], "购买") !== false || strpos($value['mark'], "扫码") !== false) {
+                if($value['type'] == 1) {
+                    $type = 1;
+                } else {
+                    $type = 2;
+                }
+                $userContributeTimeMap[$value['uid']][] = [
+                    'type' => $type,
+                    'contribute' => $value['number'],
+                    'settlementTime' => $value['settlement_time']
+                ];
+            }
+        }
+        // 老订单 产生的贡献值 并未在 贡献记录表中
+        $oldUserOfGoodsList = Db::name('old_user_of_goods')
+            ->where('status', 1) // '是否完成 0, 未完成 1 已完成',
+            ->whereIn('user_id', $uidList)
+            ->field('user_id, money, status, create_time') // 只需要下级的uid和贡献值
+            ->select()
+            ->toArray();
+        // 定义一个映射数组，用于存储不同 money 对应的 contribute 值
+        $contributeMapping = [
+            1180 => 700,
+            10620 => 6300,
+            11800 => 7000,
+            9440 => 5600,
+            2360 => 1400,
+        ];
+        // 遍历每个 $storeProductData
+        foreach ($oldUserOfGoodsList as $storeProductData) {
+            // 获取 money 的值
+            $money = $storeProductData['money'];
+            // 检查 money 是否在映射中
+            if (isset($contributeMapping[$money])) {
+                // 如果存在，则使用映射的值
+                $contribute = $contributeMapping[$money];
+            } else {
+                // 否则按默认规则计算
+                $contribute = bcmul($money, 0.7, 2);
+            }
+            // 将数据添加到 $userContributeTimeList
+            $userContributeTimeMap[$storeProductData['user_id']][] = [
+                'type' => 1,
+                'contribute' => $contribute,
+                'settlementTime' => $storeProductData['create_time']
+            ];
+        }
+        foreach ($userContributeTimeMap as $key => &$subArray) {
+            usort($subArray, function ($a, $b) {
+                return strtotime($a['settlementTime']) - strtotime($b['settlementTime']);
+            });
+        }
+        return $userContributeTimeMap;
+    }
+
+    /**
+     * 获取用户升级成业务员的时间
+     * @param $uid
+     * @return mixed|string
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function determineUserUpgradeTime($uid) {
+        $userData = $this->dao->get($uid)->toArray();
+        if (empty($userData['identity_up_time'])) {
+            $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;
+                }
+            }
+            // 2、获取用户贡献值 日志记录 对应时间
+            $userContributeTimeMap = $this->getUserContributeTimeMapByUidList([$uid]);
+            if (!empty($userContributeTimeMap[$uid])) {
+                $myArriveNumOwn = 0;
+                $myIdentityUpTime = '';
+                foreach ($userContributeTimeMap[$uid] as $value) {
+                    if ($value['type'] == 1) {
+                        $myArriveNumOwn += $value['contribute'];
+                    } else {
+                        $myArriveNumOwn -= $value['contribute'];
+                    }
+                    if ($myArriveNumOwn >= $upArriveNumOwn) {
+                        $myIdentityUpTime = $value['settlementTime'];
+                        break;
+                    }
+                }
+                if (!empty($myIdentityUpTime) && !empty($yeWuYuanId)) {
+                    $userData['identity_up_time'] = $myIdentityUpTime;
+                    $userData['user_group'] = $yeWuYuanId;
+                    $this->dao->update($uid, [
+                        'identity_up_time' => $userData['identity_up_time'],
+                        'user_group' => $yeWuYuanId
+                    ]);
+                }
+            }
+        }
+        return [
+            'user_group' => $userData['user_group'],
+            'identity_up_time' => $userData['identity_up_time']
+        ];
+    }
+
+    /**
+     * 获取用户列表中 每个人 的 个人贡献值
+     * @param array $uidList
+     * @param null $startTime
+     * @param null $endTime
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getUserContributeByUidList($uidList = [], $startTime = null, $endTime = null)
+    {
+        $subordinatesOfCurrentLevelUidList = [];
+        foreach ($uidList as $uid) {
+            $subordinatesOfCurrentLevelUidList[$uid] = 0;
+        }
+        $userContributeTimeMap = $this->getUserContributeTimeMapByUidList($uidList);
+        if (!empty($userContributeTimeMap)) {
+            foreach ($userContributeTimeMap as $uid => $contributeInfoList) {
+                foreach ($contributeInfoList as $value) {
+                    // 跳过时间范围外的 贡献值
+                    if (!empty($startTime) && strtotime($value['settlementTime']) < strtotime($startTime)) {
+                        break;
+                    }
+                    if (!empty($endTime) && strtotime($value['settlementTime']) > strtotime($endTime)) {
+                        break;
+                    }
+                    if ($value['type'] == 1) {
+                        $subordinatesOfCurrentLevelUidList[$uid] += $value['contribute'];
+                    } else {
+                        $subordinatesOfCurrentLevelUidList[$uid] -= $value['contribute'];
+                    }
+                }
+
+            }
+        }
+        return $subordinatesOfCurrentLevelUidList;
+    }
+
+
+    /**
+     * 根据时间和递归层级 获取部门下 每一层级的 贡献值
+     *  假设 老大的 下级是 张三和李四， 董事（最高级身份）需要循环最深的等级是 3 级    得出来的结果↓  这样是为了计算大小部门
+     * $userContributionSumMap[直属下级（部门）张三] =>[0 => 张三个人贡献值, 1 => 张三所有下级用户的个人贡献值, 2 => 张三所有下级用户的下级用户贡献值]
+     * $userContributionSumMap[直属下级（部门）李四] =>[0 => 李四个人贡献值, 1 => 李四所有下级用户的个人贡献值, 2 => 李四所有下级用户的下级用户贡献值]
+     * @param $uid
+     * @param null $startTime
+     * @param null $endTime
+     * @param int $depth
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getSubordinateContributeByUid($uid, $startTime, $endTime, $depth = 10)
+    {
+        // 4、获取下级用户 贡献值
+        $userContributionSumMap = [];
+        if ($depth >= 0 && !empty($startTime)) {
+            // 获取用户的直属下级
+            $uidContributeList = $this->getUidContributeListBySpreadUidList([$uid]);
+            $uidContributeUidList = array_column($uidContributeList, 'uid');
+            $subordinatesOfCurrentLevelUidList = $this->getUserContributeByUidList($uidContributeUidList, $startTime, $endTime);
+
+            foreach ($uidContributeList as $uidContribute) {
+                $goOnDepth = $depth;
+                // 获取用户规定时间内 所产生的贡献值 第一级
+                $userContributionSumMap[$uidContribute['uid']][0] = $subordinatesOfCurrentLevelUidList[$uidContribute['uid']] ?? 0;
+                if ($depth == 1) {
+                    break;
+                } else if ($depth > 1){
+                    $goOnDepth = $depth - 1;
+                }
+                // 获取每个下级（部门）的个人贡献值 $goOnDepth = 0 时表示无限递归
+                $userContributionSumMap[$uidContribute['uid']] = $this->getContributionSumByLevel(
+                    [$uidContribute['uid']],
+                    $goOnDepth,
+                    0,
+                    $startTime,
+                    $endTime
+                );
+
+                if (!empty($userContributionSumMap[$uidContribute['uid']])) {
+                    ksort($userContributionSumMap[$uidContribute['uid']]);
+                }
+                // 假设 老大的 下级是 张三和李四， 董事（最高级身份）需要循环最深的等级是 3 级    得出来的结果↓  这样是为了计算大小部门
+                // $userContributionSumMap[直属下级（部门）张三] =>[0 => 张三个人贡献值, 1 => 张三所有下级用户的个人贡献值, 2 => 张三所有下级用户的下级用户贡献值]
+                // $userContributionSumMap[直属下级（部门）李四] =>[0 => 李四个人贡献值, 1 => 李四所有下级用户的个人贡献值, 2 => 李四所有下级用户的下级用户贡献值]
+            }
+        }
+        return $userContributionSumMap;
+    }
+
+    /**
+     * 获取用户 团队贡献值信息
+     * @param $uid
+     * @param int $depth // 最深递归层级
+     * @param array $betweenTime // 贡献值获取范围
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getUserContributeInfoByDepth($uid, $depth = 10, $betweenTime = [])
+    {
+        // 3、获取个人贡献值
+        $userData = $this->dao->get($uid)->toArray();
+        // 这一步骤是为了 确定用户升级时间，因为后边的团队贡献值，需要查询 用户 升级为业务员后 所产生的团队贡献值
+        $determineResult = $this->determineUserUpgradeTime($uid);
+        $userData['user_group'] = $determineResult['user_group'];
+        $userData['identity_up_time'] = $determineResult['identity_up_time']; // 获得的值 有可能是时间 有可能是 null
+
+        $startTime = $userData['identity_up_time'];
+        $endTime = date('Y-m-d H:i:s');
+        if (!empty($betweenTime) && !empty($betweenTime['startTime']) && !empty($betweenTime['endTime'])) {
+            if(empty($startTime) || strtotime($startTime) < strtotime($betweenTime['startTime'])) {
+                $startTime = $betweenTime['startTime'];
+            }
+            if(strtotime($betweenTime['endTime']) < strtotime($endTime)) {
+                $endTime = $betweenTime['endTime'];
+            }
+        }
+
+        // 如果用户身份是  用户  则
+        /**
+         *  如果用户身份是 用户，则不计算团队贡献值，因计算团队贡献值 需要升级成业务员后 再进行进行统计
+         *  如用户也统计团队贡献值可能会导致： 用户进入系统后，不进行消费，团队贡献值确增长迅速，等某时刻 他只要 进行消费，身份就会快速跃迁，不公平
+         * （1）达标贡献值=自己消费产生的贡献值
+         * （2）团队达标贡献值= 不计算团队
+         */
+        if ($userData['user_group'] == 1) {
+            $depth = -1;
+        }
+
+        // 4、获取下级用户 贡献值
+        $userContributionSumMap = $this->getSubordinateContributeByUid($uid, $startTime, $endTime, $depth);
+        $subordinateContribution = [];
+        foreach ($userContributionSumMap as $key => $value) {
+            $subordinateContribution[$key] = array_sum($value);
+        }
+
+        $dqYj = 0;
+        $arriveNumTeam = 0;
+        if (!empty($subordinateContribution)) {
+            // 大区业绩
+            $dqYj = max($subordinateContribution);
+            // 总业绩
+            $zYj = array_sum($subordinateContribution);
+            // 小区团体业绩
+            $arriveNumTeam = bcsub($zYj, $dqYj, 2);
+        }
+
+        return [
+            'arriveNumTeam' => $arriveNumTeam, // 小部门贡献值和
+            'contribute' => $userData['contribute'], // 个人贡献值
+            'perContribute' => $userData['per_contribute'], // 直推贡献值
+            'largeContribute' => $dqYj, // 大部门贡献值
+            'subordinate' => $subordinateContribution // 各部门贡献值和
+        ];
+
+    }
 }

app/common/repositories/user/UserThirdRepository.php

@@ -747,7 +747,7 @@ class UserThirdRepository extends BaseRepository
     /**
      * 添加预估积分记录
      */
-    public static function yuguJifen($price,$user_id,$order_sn,$type_shop)
+    public function yuguJifen($price,$user_id,$order_sn,$type_shop)
     {
         if (empty($user_id)) {
             Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_sn, $order_sn, 赠送积分, 不存在用户ID"]);
@@ -847,7 +847,7 @@ class UserThirdRepository extends BaseRepository
             //判断是否是老用户  is_old=1是1.0的用户，1.0的用户要总pv*45%的红包
             if($user["is_old"]==1){
                 //添加红包
-                $hongbao=roundOptimize($inc_score*0.45,2);
+                $hongbao = $this->roundOptimize($inc_score*0.45,2);
                 $hongbao_data = [
                     "uid"           =>$user_id,
                     "number"  =>    $hongbao,
@@ -875,7 +875,7 @@ class UserThirdRepository extends BaseRepository
         
                 // @todo 用户身份比例
                 $yongjinbili = StoreOrderRepository::getUserGroupRate($sprerdUser['user_group']);
-                $tuiguanyongjin=roundOptimize($yongjinbili*$inc_score,2);//按照身份获得佣金
+                $tuiguanyongjin=$this->roundOptimize($yongjinbili*$inc_score,2);//按照身份获得佣金
 
                 //添加推广积分
                 $tuijifendata = [
@@ -896,7 +896,7 @@ class UserThirdRepository extends BaseRepository
 
                 //添加推荐献值 普通用户 贡献值为 pv* 30%；推广人是业务员及以上身份，贡献值为:pv的1:1
                 if($sprerdUser['user_group'] <= 1){
-                    $gongxian = roundOptimize($gongxian*0.3,2);
+                    $gongxian = $this->roundOptimize($gongxian*0.3,2);
                 }
                 $tuigangongxian_data = [
                     "uid"           =>$sprerdUser['uid'],

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,109 @@ 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['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['one'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['yanglao']), 'name' => '养老金总额'];
+            $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['shouyi']), 'name' => '佣金总额'];
+            $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['suoke']), 'name' => '锁客收益总额'];
+            $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['fugou']), 'name' => '复购金总额'];
+            $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['hongbao']), 'name' => '红包总额'];
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['jingdou']), 'name' => '京豆总额'];
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['gongxian']), 'name' => '贡献值总额'];
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['integral']), 'name' => '积分总额'];
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['pv']), 'name' => 'PV总额'];
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($arr['vr']), 'name' => 'VR总额'];
+            $res['left'] = $data;
+
+            //底部大模块
+            $list1 = array(
+                array('className' => 'el-icon-s-goods', 'count' => 0, 'name' => '已完成提现总额'),
+                array('className' => 'el-icon-s-goods', 'count' => 0, 'name' => '审核中总额'),
+            );
+            $list2 = array(
+                array('className' => 'el-icon-s-goods', 'count' => 0, 'name' => '合伙分红总额'),
+                array('className' => 'el-icon-s-goods', 'count' => 0, 'name' => '联创分红总额'),
+                array('className' => 'el-icon-s-goods', 'count' => 0, 'name' => '股权分红总额'),
+            );
+            $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '提现总额', 'list' => $list1];
+            $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '分红总额', 'list' => $list2];
+            
+            return app('json')->success('ok', $res);
+        } catch (\Exception $e) {
+            Db::name('log')->insert(['data' => '交易详情统计错误：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            return app('json')->fail('统计失败'. $e->getMessage());
+        }
+    }
+
     /**
      * 积分统计
      * @return mixed
@@ -188,41 +292,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/Auth.php

@@ -743,11 +743,12 @@ class Auth extends BaseController
         $data['score']=set_price_rtrim($data['score']);
         //2025新增 贡献值，红包，京东，vr，复购金
 
-        if( $user['user_group'] <= 2 ){
-            $data['contribute'] =  $user['contribute'] + $user['per_contribute'];
-        }else{
-            $data['contribute'] =  $user['contribute'];
-        }
+        // 老逻辑 需要废弃
+        // if( $user['user_group'] <= 2 ){
+        //     $data['contribute'] =  $user['contribute'] + $user['per_contribute'];
+        // }else{
+        //     $data['contribute'] =  $user['contribute'];
+        // }
 
         $date['contribute']=set_price_rtrim($data['contribute']);//贡献值
         $data['repurchase_price']=set_price_rtrim($data['repurchase_price']);//复购余额
@@ -1415,7 +1416,7 @@ class Auth extends BaseController
             if(empty($sessionKey['sessionKey'])||empty($encryptedData['encryptedData'])||empty($iv['iv'])){
                 return app('json')->fail('参数不正确');
             }
-            $appid = 'wx9082e5ac2fdb513f';//储蓄保小程序appid
+            $appid = 'wx9082e5ac2fdb513f';//幸福宝小程序appid
             if($this->source=='yhc'){
                 $appid = 'wx9082e5ac2fdb513f';//一壶茶小程序appid
             }

app/controller/api/Notify.php

@@ -146,8 +146,12 @@ class Notify
 
                             //找到对应的商品id(product_id)
                             $store_order_product_data = Db::name('store_order_product')->where('order_id',$store_order_data['order_id'])->find();
+
                             //找到对应的商品让利金额或比例
                             $store_product_data = Db::name('store_product')->where('product_id',$store_order_product_data['product_id'])->find();
+                            //找到对应的商品id的规格
+                            $store_product_attr_value = Db::name('store_product_attr_value')->where('product_id', $store_order_product_data['product_id'])->find();
+                            
                             //下单用户
                             $user_data = Db::name('user')->where('uid',$store_order_data['uid'])->find();
 
@@ -207,7 +211,7 @@ class Notify
 
                                         //推广养老金
                                         //推广佣金
-                                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                                         // 贡献值
                                         $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广精彩生活商品赠送贡献值");
                                         //积分
@@ -224,7 +228,7 @@ class Notify
                                         //积分
                                         $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 11, "推广精彩生活区商品赠送积分");
                                         // //推广佣金
-                                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                                         //养老金
                                         $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '推广获得养老金' . bcmul($pv, 0.05, 2), $store_order_data['mer_id'], 0);
                                     }
@@ -251,7 +255,7 @@ class Notify
 
                                             //Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
                                             //推广佣金
-                                            $this->bill_user_log($merchant_data['uid'],  $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'.  $yj_amount_90,$store_order_data['mer_id'],0);
+                                            $this->bill_user_log($merchant_data['uid'],  $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金',$store_order_data['mer_id'],0);
 
                                         }
 
@@ -434,7 +438,7 @@ class Notify
                                         //养老金
                                         $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
                                         //佣金
-                                        $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'. $yj_amount_90,$store_order_data['mer_id']);
+                                        $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金',$store_order_data['mer_id']);
                                         //复购金
                                         $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
 
@@ -447,7 +451,7 @@ class Notify
                                         // //推广养老金
                                         // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'推广获得养老金'.round($pv * 0.01,2),$store_order_data['mer_id']);
                                         // //推广佣金
-                                        // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.round($pv * 0.01,2),$store_order_data['mer_id']);
+                                        // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金',$store_order_data['mer_id']);
 
                                         //获取贡献值和积分和佣金
                                         $gx_jf = $spread_data['contribute'] + bcmul($pv, 0.3,2);
@@ -466,7 +470,7 @@ class Notify
                                         $this->con_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                         $this->score_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
                                         //推广佣金
-                                        $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id']);
+                                        $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金',$store_order_data['mer_id']);
                                     }
 
 
@@ -494,7 +498,7 @@ class Notify
                                     //养老金
                                     $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
                                     //佣金
-                                    $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'. $yj_amount_90,$store_order_data['mer_id']);
+                                    $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金',$store_order_data['mer_id']);
                                     //复购金
                                     $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
 
@@ -537,7 +541,7 @@ class Notify
 
                                         //Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
                                         //推广佣金
-                                        $this->bill_user_log($merchant_data['uid'],round($pv * 0.35,2),$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'.round($pv * 0.35,2),$store_order_data['mer_id']);
+                                        $this->bill_user_log($merchant_data['uid'],round($pv * 0.35,2),$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金',$store_order_data['mer_id']);
                                     }
 
                                 }
@@ -645,7 +649,7 @@ class Notify
 
                                             //推广养老金
                                             //推广佣金
-                                            $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                                            $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                                             // 贡献值
                                             $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广商贸区商品赠送贡献值");
                                             //积分
@@ -662,7 +666,7 @@ class Notify
                                             //积分
                                             $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 11, "推广商贸区商品赠送积分");
                                             // //推广佣金
-                                            $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                                            $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                                             //养老金
                                             $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '推广获得养老金' . bcmul($pv, 0.05, 2), $store_order_data['mer_id'], 0);
                                         }
@@ -678,11 +682,16 @@ class Notify
                                             $fgj_amount_10 = bcmul($pv * 0.1, 0.05, 2);//推广者的佣金抽10%到个人复购金
                                             $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
                                             //推广佣金
-                                            $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
+                                            $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金', $user_data['mer_id'], 0);
                                         }
+                                    }
+
+                                    //京豆赠送
+                                    if ($store_order_data['mer_id'] > 0) {
                                         /** @var OrderMerchantRepository $orderMerchantRepository */
                                         $orderMerchantRepository = app()->make(OrderMerchantRepository::class);
-                                        $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_order_data['extension_two']);
+                                        $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_product_attr_value['extension_one']);
+                                        $merchant_data = Db::name('merchant')->where('mer_id', $store_order_data['mer_id'])->find();
 
                                         //商户获得贡献值  ---- 3月29日  商户不再获得贡献值 改为获得分润值
                     //                    if ($concession_pri >= 0.01) {
@@ -707,17 +716,17 @@ class Notify
                     //                    }
 
                                         //商户获得京豆
-                                        if ($concession_pri >= 0.01) {
-                                            $jd = bcmul($concession_pri, $jdAndGonxianConfig['jd'], 2);
+                                        $jd = bcmul($concession_pri, $jdAndGonxianConfig['jd'], 2);
+                                        if ($jd >= 0.01) {
                                             $jd_data = [
                                                 "uid" => $merchant_data["uid"],
-                                                "mer_id" => $user_data['mer_id'],
+                                                "mer_id" => $store_order_data['mer_id'],
                                                 "number" => $jd,
                                                 "addtime" => time(),
                                                 "status" => -1,
                                                 "order_type" => 2,
                                                 "order_id" => $store_order_data['order_id'],
-                                                "mark" => "锁客商家获得京豆",
+                                                "mark" => "线上用户消费商家获得京豆",
                                                 "desc" => '',
                                                 "surplus" => $jd,
                                                 "type" => 1
@@ -1465,7 +1474,9 @@ class Notify
         ];
         // 当状态为1时是实时结算
         if($status == 1) {
-            Db::name('user')->where('uid', $uid)->inc('pv', (float)$pv)->update();
+            // Db::name('user')->where('uid', $uid)->inc('pv', (float)$pv)->update();
+            $con_data = Db::name('user')->where("uid", $uid)->find();
+            Db::name('user')->where("uid", $uid)->update(['pv' => ($con_data['pv']?:0) + $pv]);
             $pv_data['settlement_time'] = date('Y-m-d H:i:s');
         }
         Db::name("user_pv_log")->insert($pv_data);//添加pv记录

app/controller/api/entropybarter/User.php

@@ -95,12 +95,12 @@ class User extends BaseController
     /**
      * @param $uid
      * @param $spread_uid
-     * 绑定储蓄保的关系
+     * 绑定幸福宝的关系
      */
     public function cxb_bangding($uid,$spread_uid)
     {
         $spread_uid_user=Db::name('user')->where('uid',$uid)->value('spread_uid');
-        Db::name('log')->insert(['data'=>'绑定储蓄保的关系进来了他的上级ID'.$spread_uid_user]);
+        Db::name('log')->insert(['data'=>'绑定幸福宝的关系进来了他的上级ID'.$spread_uid_user]);
         if($spread_uid_user==0){
             Db::name('user')->where('uid',$uid)->update(['spread_uid'=>$spread_uid]);
         }

app/controller/api/merchant/sxy/Access.php

@@ -736,7 +736,7 @@ class Access
             $groupOrder = Db::name('order_huafei_hf')->where('order_id', (int)$oid)->find();
             if (!$groupOrder) return app('json')->fail('订单不存在或已支付');
 
-            $res = $this->pay_huifu($type,$code,$groupOrder,"储蓄保",env('APP_URL')."/api/hf_notify/huafei",'delay');
+            $res = $this->pay_huifu($type,$code,$groupOrder,"幸福宝",env('APP_URL')."/api/hf_notify/huafei",'delay');
             Db::name('log')->insert(['data'=>'汇付话费订单支付--- 返回参数'.json_encode($res)]);
             if (isset($res['id'])) {
                 return app('json')->success($res);
@@ -836,7 +836,7 @@ class Access
                     ->where(["sc.cart_id"=>$cart_id])
                     ->value('sp.store_name');
             }
-            $res = $this -> pay_huifu($type,$code,$groupOrder,$product ?? "储蓄保",env('APP_URL')."/api/hf_notify/pay",'delay');
+            $res = $this -> pay_huifu($type,$code,$groupOrder,$product ?? "幸福宝",env('APP_URL')."/api/hf_notify/pay",'delay');
             Db::name('log')->insert(['data'=>'汇付订单支付--- 返回参数'.json_encode($res)]);
             if (isset($res['id'])) {
                 Db::name('store_group_order')->where('group_order_id', $oid)->update(['hf_pay_id' => $res['id'],'pay_wx'=>systemConfig('pay_wx')]);
@@ -881,7 +881,7 @@ class Access
             Db::name("log")->insert(array('data'=>Db::name("store_product")->getLastSql()));//日志记录
 
             $productDetails = array(
-                'name' => $product ?? "储蓄保",//商品名称。需传递真实产品名称。
+                'name' => $product ?? "幸福宝",//商品名称。需传递真实产品名称。
                 'quantity' => 1,//商品数量
                 'amount' => strval($groupOrder['pay_price'] * 100),//商品单价
             );
@@ -942,7 +942,7 @@ class Access
                     ->where(["sc.cart_id"=>$cart_id])
                     ->value('sp.store_name');
             }
-            $res = $this -> pay_huifu($type,$code,$groupOrder,$product ?? "储蓄保",env('APP_URL')."/api/hf_notify/pay",'delay');
+            $res = $this -> pay_huifu($type,$code,$groupOrder,$product ?? "幸福宝",env('APP_URL')."/api/hf_notify/pay",'delay');
             Db::name('log')->insert(['data'=>'汇付订单支付--- 返回参数'.json_encode($res)]);
             if (isset($res['id'])) {
                 Db::name('store_group_order')->where('group_order_id', $oid)->update(['hf_pay_id' => $res['id'],'pay_wx'=>systemConfig('pay_wx')]);
@@ -987,7 +987,7 @@ class Access
             Db::name("log")->insert(array('data'=>Db::name("store_product")->getLastSql()));//日志记录
 
             $productDetails = array(
-                'name' => $product ?? "储蓄保",//商品名称。需传递真实产品名称。
+                'name' => $product ?? "幸福宝",//商品名称。需传递真实产品名称。
                 'quantity' => 1,//商品数量
                 'amount' => strval($groupOrder['pay_price'] * 100),//商品单价
             );
@@ -1064,8 +1064,8 @@ class Access
                 'app_id'=>$app_id,
                 'pay_channel'=>$pay_channel,
                 'pay_amt'=>strval($groupOrder['pay_price']),//金额。,
-                'goods_title'=>$product ?? "储蓄保",
-                'goods_desc'=>$product ?? "储蓄保",
+                'goods_title'=>$product ?? "幸福宝",
+                'goods_desc'=>$product ?? "幸福宝",
                 'device_info'=>[
                     'device_ip'=>app('request')->ip()
 //                    'device_ip'=>'115.171.134.68'
@@ -1094,8 +1094,8 @@ class Access
                 'app_id'=>$app_id,
                 'pay_channel'=>$pay_channel,
                 'pay_amt'=>strval($groupOrder['pay_price']),//金额。,
-                'goods_title'=>$product ?? "储蓄保",
-                'goods_desc'=>$product ?? "储蓄保",
+                'goods_title'=>$product ?? "幸福宝",
+                'goods_desc'=>$product ?? "幸福宝",
                 'device_info'=>[
                     'device_ip'=>app('request')->ip()
 //                    'device_ip'=>'115.171.134.68'
@@ -1208,7 +1208,7 @@ class Access
             Db::name("log")->insert(array('data'=>Db::name("store_product")->getLastSql()));//日志记录
 
             $productDetails = array(
-                'name' => $product ?? "储蓄保年费",//商品名称。需传递真实产品名称。
+                'name' => $product ?? "幸福宝年费",//商品名称。需传递真实产品名称。
                 'quantity' => 1,//商品数量
                 'amount' => strval($groupOrder['pay_price'] * 100),//商品单价
             );

app/controller/api/store/merchant/TaskPartnerProfits.php

@@ -23,23 +23,19 @@ class TaskPartnerProfits
             $startTime = date('Y-m-d', strtotime('monday this week', $now)); // 这周星期一的开始时间
             $endTime = date('Y-m-d', strtotime('sunday this week', $now)); // 这周星期日的结束时间
         }
-//        return ['startTime' => '2025-03-10', 'endTime' => '2025-03-23'];
+        //        return ['startTime' => '2025-03-10', 'endTime' => '2025-03-23'];
         return ['startTime' => $startTime, 'endTime' => $endTime];
     }
 
-    public function getTeamPvByTime($timePeriod = 'last_week', $removeUserIdList = [])
+    public function getTeamPvByTime($startTime, $endTime, $removeUserIdList = [])
     {
-        $timeMap = $this->getTime($timePeriod);
-        $startTime = $timeMap['startTime'];
-        $endTime = $timeMap['endTime'];
-
         // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
         $orders = Db::name("store_order")
             ->where('mer_id', 496)
             ->whereNotIn('uid', $removeUserIdList)
             ->whereIn('status', [0, 1, 2, 3])
             ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
-            ->whereBetween("pay_time", [$startTime . ' 00:00:00', $endTime . ' 23:59:59'])
+            ->whereBetween("pay_time", [$startTime, $endTime])
             ->whereNotNull("pay_time") // 排除 pay_time 为 NULL 的订单
             ->select();
 
@@ -68,24 +64,22 @@ class TaskPartnerProfits
         return $totalPv;
     }
 
-    public function getRedEnvelopeByTime($timePeriod = 'last_week', $removeUserIdList = [])
+    public function getRedEnvelopeByTime($startTime, $endTime, $removeUserIdList = [])
     {
-        $timeMap = $this->getTime($timePeriod);
-        $startTime = $timeMap['startTime'];
-        $endTime = $timeMap['endTime'];
-
         // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
         $redEnvelopeList = Db::name("user_sign_hongbao")
             ->whereNotIn('uid', $removeUserIdList)
             ->where('status', 1)
-            ->whereBetween("settlement_time", [$startTime . ' 00:00:00', $endTime . ' 23:59:59'])
+            ->whereBetween("settlement_time", [$startTime, $endTime])
             ->select()
             ->toArray();
         return floor(array_sum(array_column($redEnvelopeList, 'number')) * 100) / 100;
     }
 
-    public function partnerProfits()
+    public function partnerProfits($startTime = '', $endTime = '')
     {
+        $startTime = '2025-03-10';
+        $endTime = '2025-03-30';
         // 查询测试人员账号信息
         //18973958920
         //15186694339
@@ -101,10 +95,17 @@ class TaskPartnerProfits
             ->select()
             ->toArray();
         $removeUserIdList = array_column($removeUserList, 'uid');
+
+        if (empty($startTime) || empty($endTime)) {
+            $timeMap = $this->getTime('last_week');
+            $startTime = $timeMap['startTime'] . ' 00:00:00';
+            $endTime = $timeMap['endTime'] . ' 23:59:59';
+        }
+
         // 定义分红金额
-        $weekRecord = $this->getTeamPvByTime('last_week', $removeUserIdList);
+        $weekRecord = $this->getTeamPvByTime($startTime, $endTime, $removeUserIdList);
         // 分红金额 - 红包金额
-        $redEnvelope = $this->getRedEnvelopeByTime('last_week', $removeUserIdList);
+        $redEnvelope = $this->getRedEnvelopeByTime($startTime, $endTime, $removeUserIdList);
 
         $weekRecord -= $redEnvelope;
         if ($weekRecord <= 0) {
@@ -125,7 +126,7 @@ class TaskPartnerProfits
 
         // 3、获取 分红用户 信息 （`user_group` tinyint(1) DEFAULT '1' COMMENT '1消费者 2,推广业务员 3，业务经理 4初级合伙人5中级合伙人 6高级合伙人 7.懂事',）
         $list = Db::name("user")
-//            ->whereNotIn('uid', $removeUserIdList)
+            //            ->whereNotIn('uid', $removeUserIdList)
             ->where("user_group", "IN", [4, 5, 6])
             ->where("status", "<>", 0)
             ->where('is_del', '<>', 1)
@@ -142,33 +143,39 @@ class TaskPartnerProfits
                 $salesArr['高级']['divider_people'][] = $value['uid'];
             }
         }
+        $salesArr['初级']['divider_people_count'] = count($salesArr['初级']['divider_people']);
+        $salesArr['中级']['divider_people_count'] = count($salesArr['中级']['divider_people']);
+        $salesArr['高级']['divider_people_count'] = count($salesArr['高级']['divider_people']);
+
 
         // 5、移除特定人员
         // 要移动的ID数组
-//        $ids_to_remove_from_junior = array(12, 69, 144); // 从初级中移除的ID
-//        $ids_to_remove_from_intermediate = array(49); // 从中级中移除的ID
-//        // 查找初级并获取其divider_people
-//        $junior = &$salesArr['初级']['divider_people']; // 使用引用，以便直接修改数组
-//        // 查找中级并获取其divider_people
-//        $intermediate = &$salesArr['中级']['divider_people']; // 使用引用，以便直接修改数组
-//        // 从初级的divider_people中移除特定的ID
-//        foreach ($ids_to_remove_from_junior as $id) {
-//            $key = array_search($id, $junior);
-//            if ($key !== false) {
-//                unset($junior[$key]); // 移除初级中的特定ID
-//            }
-//        }
-//        // 从中级的divider_people中移除特定的ID
-//        foreach ($ids_to_remove_from_intermediate as $id) {
-//            $key = array_search($id, $intermediate);
-//            if ($key !== false) {
-//                unset($intermediate[$key]); // 移除中级中的特定ID
-//            }
-//        }
-//        // 重置数组的索引，因为unset会留下空位
-//        $salesArr['初级']['divider_people'] = array_values($junior);
-//        $salesArr['中级']['divider_people'] = array_values($intermediate);
-
+        //        $ids_to_remove_from_junior = array(12, 69, 144); // 从初级中移除的ID
+        //        $ids_to_remove_from_intermediate = array(49); // 从中级中移除的ID
+        //        // 查找初级并获取其divider_people
+        //        $junior = &$salesArr['初级']['divider_people']; // 使用引用，以便直接修改数组
+        //        // 查找中级并获取其divider_people
+        //        $intermediate = &$salesArr['中级']['divider_people']; // 使用引用，以便直接修改数组
+        //        // 从初级的divider_people中移除特定的ID
+        //        foreach ($ids_to_remove_from_junior as $id) {
+        //            $key = array_search($id, $junior);
+        //            if ($key !== false) {
+        //                unset($junior[$key]); // 移除初级中的特定ID
+        //            }
+        //        }
+        //        // 从中级的divider_people中移除特定的ID
+        //        foreach ($ids_to_remove_from_intermediate as $id) {
+        //            $key = array_search($id, $intermediate);
+        //            if ($key !== false) {
+        //                unset($intermediate[$key]); // 移除中级中的特定ID
+        //            }
+        //        }
+        //        // 重置数组的索引，因为unset会留下空位
+        //        $salesArr['初级']['divider_people'] = array_values($junior);
+        //        $salesArr['中级']['divider_people'] = array_values($intermediate);
+
+        // 获取查询合伙人 团队贡献值 最深的到哪一层
+        $depth = Db::name("system_config_value")->where(["config_key" => "team_commission_recursion_depth"])->value("value");
 
         // 6、执行分开发放
         $partnerProfitsPvListByUid = [];
@@ -176,14 +183,16 @@ class TaskPartnerProfits
             // 6.1 计算可分红金额
             //比如这个周的总业绩是 8400
             //周总业绩(8400) * 合伙人级别的分佣比例(15%) = 可分红的佣金(1260)
-//            $salesArr[$key]['fs_money_nums'] = round($weekRecord * $value['profit_rate'], 2);
+            //            $salesArr[$key]['fs_money_nums'] = round($weekRecord * $value['profit_rate'], 2);
             $salesArr[$key]['fs_money_nums'] = floor(($weekRecord * ($value['profit_rate'] / 100)) * 100) / 100;
             //可分红的业绩(分为两半，各50%，一部分是分给双联盟比例，一部分是小业绩比例)
             //把本周的业绩(8400) * 合伙人级别的分佣比例(15%) * 0.5 = 630（可分红佣金的 50%）
-//            $salesArr[$key]['fs_money'] = round($salesArr[$key]['fs_money_nums'] / 2, 2);
+            //            $salesArr[$key]['fs_money'] = round($salesArr[$key]['fs_money_nums'] / 2, 2);
             $salesArr[$key]['fs_money'] = floor(($salesArr[$key]['fs_money_nums'] / 2) * 100) / 100;
 
             // 6.2 计算所有人的 PV值
+            $salesArr[$key]['weekRecord'] = $weekRecord;
+            $salesArr[$key]['redEnvelope'] = $redEnvelope;
             $salesArr[$key]['maxValueAll'] = 0;
             $salesArr[$key]['sumOfOthersAll'] = 0;
             $salesArr[$key]['dividerPeoplePv'] = [];
@@ -239,14 +248,14 @@ class TaskPartnerProfits
                 //个人小区(佣金少的一部分) 权重 计算权重
                 //返回是数组，下标0是最小的值(业绩小的)，下标1是最大的值(业绩大的)
                 $userPvSmallNum = $value['dividerPeoplePv'][$v]['sumOfOthers'] ?? 0;
-//                $myMixMoney = round($amount * ($userPvSmallNum / $sumOfOthersAll), 2);
+                //                $myMixMoney = round($amount * ($userPvSmallNum / $sumOfOthersAll), 2);
                 $myMixMoney = floor(($amount * (floor(($userPvSmallNum / $sumOfOthersAll) * 100) / 100)) * 100) / 100;
 
                 //个人双区总佣金 权重 计算
                 $myBill = $value['dividerPeoplePv'][$v]['maxValue'] ?? 0;
                 //中级合伙人。userid=17可以分到双区可分红的金额
                 //可分红的佣金 * (中级合伙人个人的双区总业绩 / 当前等级所有合伙人的双联盟业绩) = 当前用户可以获取到的分红佣金(双区联盟总业绩加权佣金),287742 * (61.95/431032)=41.36
-//                $myWeightMoney = round($amount * ($myBill / $maxValueAll), 2);
+                //                $myWeightMoney = round($amount * ($myBill / $maxValueAll), 2);
                 $myWeightMoney = floor(($amount * (floor((($myBill + $userPvSmallNum) / ($maxValueAll + $sumOfOthersAll)) * 100) / 100)) * 100) / 100;
 
 
@@ -254,7 +263,6 @@ class TaskPartnerProfits
                 $salesArr[$key]['dividerPeoplePv'][$v]['myMixMoney'] = $myMixMoney;
                 $salesArr[$key]['dividerPeoplePv'][$v]['maxValueAll'] = $maxValueAll;
                 $salesArr[$key]['dividerPeoplePv'][$v]['sumOfOthersAll'] = $sumOfOthersAll;
-                $salesArr[$key]['dividerPeoplePv'][$v]['weekRecord'] = $weekRecord;
 
                 # code...
                 $allAward = $myWeightMoney + $myMixMoney;
@@ -266,7 +274,7 @@ class TaskPartnerProfits
 
                 $userdatassss = db::name("old_user_jbp")->where("id", $v)->find();
                 $datas_log = [
-                    'note' => "名称:" . $userdatassss['nick_name'] . " 用户:" . $v . " 双联盟总业绩:" . $maxValueAll . " 我的双区业绩:" . $myBill . " 小区总业绩:" . $sumOfOthersAll . " 我的业绩小的:" . $userPvSmallNum[0] . "  可分红佣金:" . $amount . "  可分红总佣金:" . $fsMoneyNums . "  小区业绩可分红:" . $myMixMoney . " 大区业绩可分红:" . $myWeightMoney . " 实际分得:" . $yj_90,
+                    'note' => "名称:" . $userdatassss['nick_name'] . " 用户:" . $v . " 双联盟总业绩:" . $maxValueAll . " 我的双区业绩:" . $myBill . " 小区总业绩:" . $userPvSmallNum . " 我的业绩小的:" . $myMixMoney . "  可分红佣金:" . $amount . "  可分红总佣金:" . $fsMoneyNums . "  小区业绩可分红:" . $myMixMoney . " 双区业绩可分红:" . $myWeightMoney . " 实际分得:" . $yj_90,
                     'create_time' => date('Y-m-d H:i:s')
                 ];
                 $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
@@ -285,7 +293,7 @@ class TaskPartnerProfits
                 //入账星级分红记录表
                 $week_data = [];
                 $week_data['user_id'] = $v;
-                $week_data['user_star_id'] = $key;
+                $week_data['user_star_id'] = $value['id'];
                 $week_data['award_num'] = $myWeightMoney;
                 $week_data['award_num_sm'] = $myMixMoney;
                 $week_data['remark'] = "星级分红主动执行:" . $yj_90;
@@ -295,7 +303,6 @@ class TaskPartnerProfits
                 $week_data['owner_bill'] = $maxValueAll;  //总流水金额
                 $week_data['my_bill'] = $myBill;  //我的流水
                 $week_data['create_time'] = time();
-
                 Db::name("old_user_weekaward")->insert($week_data);
 
                 $this->bill_user_log111111($v, "合伙人分佣", $yj_90, "合伙人分佣明细入账", 11);//联创分佣明细2.0系统
@@ -578,10 +585,10 @@ class TaskPartnerProfits
 
         // 计算除去特定值后的总和
         $otherMoneyRecords = [];
-//        $otherMoneyRecords = Db::name("old_user_of_goods")
-//            ->whereIn("user_id", $userIdList)
-//            ->whereNotIn('money', [1180, 11800, 10620, 9440, 2360])
-//            ->select();
+        //        $otherMoneyRecords = Db::name("old_user_of_goods")
+        //            ->whereIn("user_id", $userIdList)
+        //            ->whereNotIn('money', [1180, 11800, 10620, 9440, 2360])
+        //            ->select();
         $otherMoneySum = 0;
         foreach ($otherMoneyRecords as $record) {
             $otherMoneySum += $record['money'];

app/controller/api/store/merchant/Taskorder.php

@@ -1593,7 +1593,7 @@ public function getbig_samll_datas_copy($user_id) {
                     //积分
                     $this->score_log($spread_data['uid'],$ssf,$store_order_data['order_id'],11,"精彩生活区商品赠送积分");
                     // //推广佣金
-                    $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id'],0);
+                    $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金',$store_order_data['mer_id'],0);
                     //养老金
                     $this->bill_user_log($spread_data['uid'],round($pv * 0.05,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'推广获得养老金'.round($pv * 0.05,2),$store_order_data['mer_id'],0);
                 }
@@ -1620,7 +1620,7 @@ public function getbig_samll_datas_copy($user_id) {
                   //推广养老金
                  // $this->bill_user_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'推广获得养老金'.round($pv * 0.3,2),$store_order_data['mer_id']);
                   //推广佣金
-                  $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id'],0);
+                  $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金',$store_order_data['mer_id'],0);
                   $this->con_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
                   $this->score_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
                   
@@ -1654,7 +1654,7 @@ public function getbig_samll_datas_copy($user_id) {
                     
                     Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
                 //推广佣金
-                $this->bill_user_log($merchant_data['uid'],  $yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.  $yj_amount_90,$store_order_data['mer_id'],0);
+                $this->bill_user_log($merchant_data['uid'],  $yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金',$store_order_data['mer_id'],0);
                         
                         }
 
@@ -1804,7 +1804,7 @@ public function getbig_samll_datas_copy($user_id) {
                 //养老金
                 $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
                 //佣金
-                $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'. $yj_amount_90,$store_order_data['mer_id']);
+                $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金',$store_order_data['mer_id']);
                 //复购金
                 $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1);
 
@@ -1817,7 +1817,7 @@ public function getbig_samll_datas_copy($user_id) {
                     // //推广养老金
                     // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'推广获得养老金'.round($pv * 0.01,2),$store_order_data['mer_id']);
                     // //推广佣金
-                    // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.round($pv * 0.01,2),$store_order_data['mer_id']);
+                    // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金',$store_order_data['mer_id']);
                     
                 //获取贡献值和积分和佣金
                 $gx_jf = $spread_data['contribute'] + round($pv * 0.03,2);
@@ -1836,7 +1836,7 @@ public function getbig_samll_datas_copy($user_id) {
                 $this->con_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
                 $this->score_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
                 //推广佣金
-                $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id']);
+                $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金',$store_order_data['mer_id']);
             }
 
         
@@ -1864,7 +1864,7 @@ public function getbig_samll_datas_copy($user_id) {
                 
                 Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
             //推广佣金
-            $this->bill_user_log($merchant_data['uid'],round($pv * 0.35,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金'.round($pv * 0.35,2),$store_order_data['mer_id']);
+            $this->bill_user_log($merchant_data['uid'],round($pv * 0.35,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得佣金',$store_order_data['mer_id']);
             }
 
         }

app/controller/api/store/merchant/Taskorderguquan.php

@@ -7,22 +7,16 @@
 
 namespace app\controller\api\store\merchant;
 
-use think\App;
-use crmeb\basic\BaseController;
-use app\common\repositories\system\merchant\MerchantRepository as repository;
 use think\facade\Db;
-use think\facade\Log;
-use function Symfony\Component\VarDumper\Dumper\esc;
 
-class Taskorderguquan extends BaseController
+class Taskorderguquan
 {
 
 
     public function lst6()
     {
-
-        $week_record = 10500 + 50000; //20250310
-
+        $startTime = '2025-03-10';
+        $endTime = '2025-03-30';
         // 查询测试人员账号信息
         //18973958920
         //15186694339
@@ -38,16 +32,25 @@ class Taskorderguquan extends BaseController
             ->select()
             ->toArray();
         $removeUserIdList = array_column($removeUserList, 'uid');
-        // 定义分红金额
-        $week_record = $this->getTeamPvByTime('last_week', $removeUserIdList);
-        // 分红金额 - 红包金额
-        $redEnvelope = $this->getRedEnvelopeByTime('last_week', $removeUserIdList);
 
-        $week_record -= $redEnvelope;
+        if (empty($startTime) || empty($endTime)) {
+            $timeMap = $this->getTime('last_week');
+            $startTime = $timeMap['startTime'] . ' 00:00:00';
+            $endTime = $timeMap['endTime'] . ' 23:59:59';
+        }
 
+        // 定义分红金额
+        $weekRecord = $this->getTeamPvByTime($startTime, $endTime, $removeUserIdList);
+        // 分红金额 - 红包金额
+        $redEnvelope = $this->getRedEnvelopeByTime($startTime, $endTime, $removeUserIdList);
 
-        $stock_comm = round($week_record * 0.05 ,2);
+        $weekRecord -= $redEnvelope;
+        if ($weekRecord <= 0) {
+            return json('无效分红金额');
+        }
 
+        // $stock_comm = round($weekRecord * 0.05 ,2);
+        $stock_comm = floor(($weekRecord * 0.05) * 100) / 100;
 
         //获取股权分红的人
 
@@ -55,12 +58,22 @@ class Taskorderguquan extends BaseController
 
         $stockuserdatas = db::name("old_user_stock")->select();//获取所有用户
 
-        if(count($stockuserdatas) > 0){
-            $one_pack_comm_data = round($stock_comm / $GetAllUserPackNum,2);//获取每份的单佣金
+        $salesArr = [];
+        if (count($stockuserdatas) > 0) {
+            // $one_pack_comm_data = round($stock_comm / $GetAllUserPackNum,2);//获取每份的单佣金
+            $one_pack_comm_data = floor(($stock_comm / $GetAllUserPackNum) * 100) / 100;
 
             foreach ($stockuserdatas as &$v) {
-                $v['getcomm'] = $v['pack'] * $one_pack_comm_data;
-                $v['allgetcomm'] =  $v['allgetcomm'] + $v['getcomm'];
+                $salesArr[] = [
+                    'stock_comm' => $stock_comm,
+                    'GetAllUserPackNum' => $GetAllUserPackNum,
+                    'uid' => $v['user_id'],
+                    'pack' => $v['pack'],
+                    'one_pack_comm_data' => $one_pack_comm_data,
+                    'getcomm' => floor(($v['pack'] * $one_pack_comm_data) * 100) / 100
+                ];
+                $v['getcomm'] = floor(($v['pack'] * $one_pack_comm_data) * 100) / 100;
+                $v['allgetcomm'] = $v['allgetcomm'] + $v['getcomm'];
                 $v['update_time'] = time();
 
                 $yj_90 = $v['getcomm'] * 0.9;
@@ -73,46 +86,47 @@ class Taskorderguquan extends BaseController
                     'update_time' => $v['update_time']
                 ]);
 
-                Db::name("user")->where("uid",$v['user_id'])->inc("brokerage_price", $yj_90)->save();
-                $res1 = Db::name("user")->where("uid",$v['user_id'])->inc("total_amount_old", $yj_90)->save();
-                $res2 = Db::name("user")->where("uid",$v['user_id'])->inc("amount_old", $yj_90)->save();
+                Db::name("user")->where("uid", $v['user_id'])->inc("brokerage_price", $yj_90)->save();
+                $res1 = Db::name("user")->where("uid", $v['user_id'])->inc("total_amount_old", $yj_90)->save();
+                $res2 = Db::name("user")->where("uid", $v['user_id'])->inc("amount_old", $yj_90)->save();
 
-                $res3 = Db::name("user")->where("uid",$v['user_id'])->inc("fugou", $fg_10)->save();
+                $res3 = Db::name("user")->where("uid", $v['user_id'])->inc("fugou", $fg_10)->save();
 
-                $res =true;
-                if($res){
-                    $das = $this->change_user_log($v['user_id'],'amount_old',1, $yj_90,"member_award_stock","股权分红入账"."-".$v['pack']);//释放佣金
+                $res = true;
+                if ($res) {
+                    $das = $this->change_user_log($v['user_id'], 'amount_old', 1, $yj_90, "member_award_stock", "股权分红入账" . "-" . $v['pack']);//释放佣金
 
                     //入账星级分红记录表
                     $week_data = [];
-                    $week_data['user_id'] =  $v['user_id'];
-                    $week_data['user_star_id'] =  0;
-                    $week_data['award_num'] =  0;
-                    $week_data['award_num_sm'] =  0;
-                    $week_data['remark'] =  "股权分红主动执行" . $yj_90;
-                    $week_data['week_record'] =  $week_record;
-                    $week_data['all_amount'] =  $stock_comm;
-                    $week_data['radio'] =  2;
-                    $week_data['owner_bill'] =  0;  //总流水金额
+                    $week_data['user_id'] = $v['user_id'];
+                    $week_data['user_star_id'] = 0;
+                    $week_data['award_num'] = 0;
+                    $week_data['award_num_sm'] = 0;
+                    $week_data['remark'] = "股权分红主动执行" . $yj_90;
+                    $week_data['week_record'] = $weekRecord;
+                    $week_data['all_amount'] = $stock_comm;
+                    $week_data['radio'] = 2;
+                    $week_data['owner_bill'] = 0;  //总流水金额
                     $week_data['my_bill'] = 0;  //我的流水
                     $week_data['create_time'] = time();
 
 
                     Db::name("old_user_weekaward")->insert($week_data);
 
-                    $userdatassss = db::name("old_user_jbp")->where("id",$v['user_id'])->find();
+                    $userdatassss = db::name("old_user_jbp")->where("id", $v['user_id'])->find();
                     $datas_log = [
-                        'note'=>"名称:".  $userdatassss['nick_name']  . " 用户:".  $v['user_id'] . " 新增股权佣金:" .  $yj_90,
-                        'create_time'=>date('Y-m-d H:i:s')
+                        'note' => "名称:" . $userdatassss['nick_name'] . " 用户:" . $v['user_id'] . " 新增股权佣金:" . $yj_90,
+                        'create_time' => date('Y-m-d H:i:s')
                     ];
                     $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
 
-                    $this->bill_user_log111111($v['user_id'],"股权分佣",  $yj_90,"股权明细入账",13);//股权分佣明细2.0系统
+                    $this->bill_user_log111111($v['user_id'], "股权分佣", $yj_90, "股权明细入账", 13);//股权分佣明细2.0系统
 
-                    $this->fugou_user_log($v['user_id'],$fg_10,16,1,1);//复购金明细入账
+                    $this->fugou_user_log($v['user_id'], $fg_10, 16, 1, 1);//复购金明细入账
                 }
             }
         }
+        return json($salesArr);
         //股权分红 end
     }
 
@@ -252,19 +266,15 @@ class Taskorderguquan extends BaseController
         return ['startTime' => $startTime, 'endTime' => $endTime];
     }
 
-    public function getTeamPvByTime($timePeriod = 'last_week', $removeUserIdList = [])
+    public function getTeamPvByTime($startTime, $endTime, $removeUserIdList = [])
     {
-        $timeMap = $this->getTime($timePeriod);
-        $startTime = $timeMap['startTime'];
-        $endTime = $timeMap['endTime'];
-
         // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
         $orders = Db::name("store_order")
             ->where('mer_id', 496)
             ->whereNotIn('uid', $removeUserIdList)
             ->whereIn('status', [0, 1, 2, 3])
             ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
-            ->whereBetween("pay_time", [$startTime . ' 00:00:00', $endTime . ' 23:59:59'])
+            ->whereBetween("pay_time", [$startTime, $endTime])
             ->whereNotNull("pay_time") // 排除 pay_time 为 NULL 的订单
             ->select();
 
@@ -293,17 +303,13 @@ class Taskorderguquan extends BaseController
         return $totalPv;
     }
 
-    public function getRedEnvelopeByTime($timePeriod = 'last_week', $removeUserIdList = [])
+    public function getRedEnvelopeByTime($startTime, $endTime, $removeUserIdList = [])
     {
-        $timeMap = $this->getTime($timePeriod);
-        $startTime = $timeMap['startTime'];
-        $endTime = $timeMap['endTime'];
-
         // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
         $redEnvelopeList = Db::name("user_sign_hongbao")
             ->whereNotIn('uid', $removeUserIdList)
             ->where('status', 1)
-            ->whereBetween("settlement_time", [$startTime . ' 00:00:00', $endTime . ' 23:59:59'])
+            ->whereBetween("settlement_time", [$startTime, $endTime])
             ->select()
             ->toArray();
         return floor(array_sum(array_column($redEnvelopeList, 'number')) * 100) / 100;

app/controller/api/store/merchant/Taskorderlianc.php

@@ -7,14 +7,9 @@
 
 namespace app\controller\api\store\merchant;
 
-use think\App;
-use crmeb\basic\BaseController;
-use app\common\repositories\system\merchant\MerchantRepository as repository;
 use think\facade\Db;
-use think\facade\Log;
-use function Symfony\Component\VarDumper\Dumper\esc;
 
-class Taskorderlianc extends BaseController
+class Taskorderlianc
 {
 
     /**
@@ -278,10 +273,8 @@ class Taskorderlianc extends BaseController
 
     public function lst2()
     {
-
-
-        $week_record = 10500 + 50000; //20250310
-
+        $startTime = '2025-03-10';
+        $endTime = '2025-03-30';
         // 查询测试人员账号信息
         //18973958920
         //15186694339
@@ -297,17 +290,26 @@ class Taskorderlianc extends BaseController
             ->select()
             ->toArray();
         $removeUserIdList = array_column($removeUserList, 'uid');
+
+        if (empty($startTime) || empty($endTime)) {
+            $timeMap = $this->getTime('last_week');
+            $startTime = $timeMap['startTime'] . ' 00:00:00';
+            $endTime = $timeMap['endTime'] . ' 23:59:59';
+        }
+
         // 定义分红金额
-        $week_record = $this->getTeamPvByTime('last_week', $removeUserIdList);
+        $weekRecord = $this->getTeamPvByTime($startTime, $endTime, $removeUserIdList);
         // 分红金额 - 红包金额
-        $redEnvelope = $this->getRedEnvelopeByTime('last_week', $removeUserIdList);
+        $redEnvelope = $this->getRedEnvelopeByTime($startTime, $endTime, $removeUserIdList);
 
-        $week_record -= $redEnvelope;
+        $weekRecord -= $redEnvelope;
+        if ($weekRecord <= 0) {
+            return json('无效分红金额');
+        }
 
 
-        $originator_award = round(($week_record * 0.05), 2);
+        $originator_award = round(($weekRecord * 0.05), 2);
 
-        $list = Db::name("user")->where("originator_id_old", ">", 0)->where("status", 1)->field("uid,originator_id_old")->select()->toArray();
 
         // foreach($list as $k=>$v){
         //     var_dump($v);
@@ -318,14 +320,16 @@ class Taskorderlianc extends BaseController
         $sum_money = Db::name("old_user_lianc")->sum("number");
 
         $lianc_list = Db::name("old_user_lianc")->order("id desc")->field("id,number,title")->select()->toArray();
-        $user_arr = [];
 
-        $lianc_list_arr = [];
-        foreach ($lianc_list as $key => $value) {
-            # code...
-            $lianc_list_arr[$value['id']] = $value;
-        }
+        $lianc_list_arr = array_column($lianc_list, null, 'id');
 
+        $list = Db::name("user")
+            ->where("originator_id_old", ">", 0)
+            ->where("status", 1)
+            ->field("uid,originator_id_old")
+            ->select()
+            ->toArray();
+        $user_arr = [];
         foreach ($list as $key => $value) {
             # code...
             $user_arr[$value['originator_id_old']]['people'][] = $value['uid'];
@@ -334,22 +338,32 @@ class Taskorderlianc extends BaseController
             $user_arr[$value['originator_id_old']]['id'] = $lianc_list_arr[$value['originator_id_old']]['id'];
         }
 
-
         //处理计算权重 和平均分配的金额
         $total_num = 0;
         $count_num = 0;
         foreach ($user_arr as $key => $value) {
+            $user_arr[$key]['people_count'] = count($user_arr[$key]['people']);
             # code...
-            $total_num += round($value['money'] * count($value['people']) / 1000, 2);
+            // floor(($weekRecord * ($value['profit_rate'] / 100)) * 100) / 100;
+            // $total_num += round($value['money'] * count($value['people']) / 1000, 2);
+            $total_num += floor(($value['money'] * count($value['people'])) * 100) / 100;
+
+            if (isset($user_arr[$key]['total_num'])) {
+                $user_arr[$key]['total_num'] += floor(($value['money'] * count($value['people'])) * 100) / 100;
+            } else {
+                $user_arr[$key]['total_num'] = 0;
+            }
             $count_num += count($value['people']);
         }
         foreach ($user_arr as $key => $value) {
             # code...
-            $rate = round((count($value['people']) * $value['money']) / $total_num, 2) / 1000;
+            // $rate = round((count($value['people']) * $value['money']) / $total_num, 2) / 1000;
+            $rate = floor(($value['money'] * count($value['people']) / $total_num) * 100) / 100;
             $user_arr[$key]['rate'] = $rate;
-            $distribution_money = round($originator_award * $rate, 2);
+            $distribution_money = floor($originator_award * $rate * 100) / 100;
             $user_arr[$key]['distribution_money'] = $distribution_money;
-            $user_arr[$key]['people_award'] = round($distribution_money / count($value['people']), 2);//可分配佣金
+            // $user_arr[$key]['people_award'] = round($distribution_money / count($value['people']), 2);//可分配佣金
+            $user_arr[$key]['people_award'] = floor($distribution_money / count($value['people']) * 100) / 100;//可分配佣金
         }
 
         $count = 0;
@@ -359,7 +373,6 @@ class Taskorderlianc extends BaseController
             foreach ($value['people'] as $k => $v) {
                 # code...
                 $award = $value['people_award'];
-
                 //90给佣金，10给复购金
                 $yj_90 = $award * 0.9;
                 $fg_10 = $award * 0.1;
@@ -399,6 +412,7 @@ class Taskorderlianc extends BaseController
                 }
             }
         }
+        return json($user_arr);
     }
 
     //添加复购金
@@ -617,19 +631,15 @@ class Taskorderlianc extends BaseController
         return ['startTime' => $startTime, 'endTime' => $endTime];
     }
 
-    public function getTeamPvByTime($timePeriod = 'last_week', $removeUserIdList = [])
+    public function getTeamPvByTime($startTime, $endTime, $removeUserIdList = [])
     {
-        $timeMap = $this->getTime($timePeriod);
-        $startTime = $timeMap['startTime'];
-        $endTime = $timeMap['endTime'];
-
         // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
         $orders = Db::name("store_order")
             ->where('mer_id', 496)
             ->whereNotIn('uid', $removeUserIdList)
             ->whereIn('status', [0, 1, 2, 3])
             ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
-            ->whereBetween("pay_time", [$startTime . ' 00:00:00', $endTime . ' 23:59:59'])
+            ->whereBetween("pay_time", [$startTime, $endTime])
             ->whereNotNull("pay_time") // 排除 pay_time 为 NULL 的订单
             ->select();
 
@@ -658,17 +668,13 @@ class Taskorderlianc extends BaseController
         return $totalPv;
     }
 
-    public function getRedEnvelopeByTime($timePeriod = 'last_week', $removeUserIdList = [])
+    public function getRedEnvelopeByTime($startTime, $endTime, $removeUserIdList = [])
     {
-        $timeMap = $this->getTime($timePeriod);
-        $startTime = $timeMap['startTime'];
-        $endTime = $timeMap['endTime'];
-
         // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
         $redEnvelopeList = Db::name("user_sign_hongbao")
             ->whereNotIn('uid', $removeUserIdList)
             ->where('status', 1)
-            ->whereBetween("settlement_time", [$startTime . ' 00:00:00', $endTime . ' 23:59:59'])
+            ->whereBetween("settlement_time", [$startTime, $endTime])
             ->select()
             ->toArray();
         return floor(array_sum(array_column($redEnvelopeList, 'number')) * 100) / 100;

app/controller/api/store/product/StoreProduct.php

@@ -251,7 +251,7 @@ class StoreProduct extends BaseController
     //生成邀请小程序码
     public function invite_code(){
         $uid = $this->request->param('uid',0);
-        $type = 0;//0-储蓄保 1-国盛 2-一壶茶
+        $type = 0;//0-幸福宝 1-国盛 2-一壶茶
         $imgId = $this->request->param('imgId',0);
 
         //删除老数据
@@ -556,7 +556,7 @@ class StoreProduct extends BaseController
                         'angle' => 0,
                     ),
                     array(
-                        'text' => '加入储蓄保，一起攒攒攒',
+                        'text' => '加入幸福宝，一起攒攒攒',
                         'left' => 400,
                         'top' => 1200,
                         'fontPath' => $filelink['Normal'],     //字体文件

app/controller/api/store/service/Huafei.php

@@ -95,11 +95,11 @@ class Huafei extends BaseController
 					Db::name('log')->insert(['data'=>'话费充值汇付支付撤销返回结果：'.json_encode($hf_refund_res)]);
 
 					//把赠送出去的养老金 积分 贡献值 复购金 改为已失效
-					Db::name('user_bill')->where('order_sn', $huafeiInfo['order_no'])->update(['status'=> -1]);
-					Db::name('user_sign_score')->where('order_id', $huafeiInfo['order_no'])->update(['status'=> 0]);
-					Db::name('user_sign_gongxian')->where('order_id', $huafeiInfo['order_no'])->update(['status'=> 0]);
-					Db::name('user_sign_fugou')->where('order_id', $huafeiInfo['order_no'])->update(['status'=> 0]);
-					Db::name('user_sign_hongbao')->where('order_id', $huafeiInfo['order_no'])->update(['status'=> 0]);
+					Db::name('user_bill')->where('order_sn', $huafeiInfo['order_sn'])->update(['status'=> -1]);
+					Db::name('user_sign_score')->where('order_id', $huafeiInfo['order_sn'])->update(['status'=> 0]);
+					Db::name('user_sign_gongxian')->where('order_id', $huafeiInfo['order_sn'])->update(['status'=> 0]);
+					Db::name('user_sign_fugou')->where('order_id', $huafeiInfo['order_sn'])->update(['status'=> 0]);
+					Db::name('user_sign_hongbao')->where('order_id', $huafeiInfo['order_sn'])->update(['status'=> 0]);
 				}
 	
 				echo 'success';
@@ -301,7 +301,7 @@ class Huafei extends BaseController
 		$request['mobile'] = $phone;
 		$request['money'] = $money;
 		$request['recharge_type'] = 0;
-		$request['notify_url'] = 'https://api.hxxfb.com/api/huafei/notify';
+		$request['notify_url'] = 'https://' . request()->host() . '/api/huafei/notify';
 		return $this->execute('/rest/Recharge/PushOrder', $request);
 	}
 

app/controller/api/user/Im.php

@@ -305,7 +305,7 @@ class Im
      * 加群
      * @param $group_id string 群组id
      * @param $user_id string 环信用户id
-     * @param $uid int 储蓄保用户id
+     * @param $uid int 幸福宝用户id
      */
     public function createGroupUser($group_id, $user_id, $uid)
     {

app/controller/api/user/User.php

@@ -218,18 +218,22 @@ class User extends BaseController
         $where['uid'] = $uid;
 
         if ($pm==0){
-
-            $data = DB::name('user_sign_hongbao')->where($where)->where(['type' => 1,'status' => 1])->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_hongbao')->where($where)->where('type',1)->where('status',1)->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==1){
             $data = DB::name('user_sign_hongbao')->where($where)->where(['type' => 2,'status' => 1])->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
         }
         if($pm==2){
-            $data = DB::name('user_sign_hongbao')->where($where)->where('status', -1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
+            $data = DB::name('user_sign_hongbao')->where($where)->where('type',1)->where([['status','in','-1,0']])->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+            if($data){
+                $data = $data->toArray();
+                foreach ($data as $k=>$v){
+                    if($v['status'] == 0){
+                        $data[$k]['mark'] = '(失效)' . $v['mark'];
+                    }
+                }
+            }
         }
-        log::info("=======date==={$data}");
         return app("json")->success($data);
     }
 
@@ -310,6 +314,24 @@ class User extends BaseController
         log::info("============gongxianinfo");
         $user = $this->request->userInfo();
         if($user->uid>0){
+            // 先去更新一下用户身份
+            $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);
+            $con = DB::name('user')->where('uid', $user->uid)->find();
+            $isNormalUser = false;
+            if ($con['user_group'] == 1) {
+                $isNormalUser = true;
+            }
+            $data = [
+                'no_total_source' => Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user->uid)->sum('number'),
+                'team_gongxian_num' => $result['arriveNumTeam'],
+                'zhitui' => $result['perContribute'],
+                'total_source' => $result['contribute'],
+                'isNormalUser' => $isNormalUser
+            ];
+            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();
@@ -408,17 +430,24 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_gongxian')->where($where)->where('status', 1)->where('number', '<>',0)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_gongxian')->where($where)->where('status',1)->where('number', '<>',0)->field('id,mark,number,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+
         }
 //        if($pm==1){
 //            $data = DB::name('user_sign_gongxian')->where($where)->where('pm', 2)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 //
 //        }
         if($pm==2){
-            $data = DB::name('user_sign_gongxian')->where($where)->where('number', '<>',0)->where('status', -1)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
+            $data = DB::name('user_sign_gongxian')->where($where)->where('number', '<>',0)->where([['status','in','-1,0']])->field('id,mark,number,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+            if($data){
+                $data = $data->toArray();
+                foreach ($data as $k=>$v){
+                    if($v['status'] == 0){
+                        $data[$k]['mark'] = '(失效)' . $v['mark'];
+                    }
+                }
+            }
         }
-        log::info("=======date==={$data}");
         return app("json")->success($data);
     }
 
@@ -450,18 +479,25 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_jingdou')->where($where)->where('type', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_jingdou')->where($where)->where('type', 1)->where('status',1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==1){
             $data = DB::name('user_sign_jingdou')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         if($pm==2){
-            $data = DB::name('user_sign_jingdou')->where($where)->where('status', -1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_jingdou')->where($where)->where([['status','in','-1,0']])->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+            if($data){
+                $data = $data->toArray();
+                foreach ($data as $k=>$v){
+                    if($v['status'] == 0){
+                        $data[$k]['mark'] = '(失效)' . $v['mark'];
+                    }
+                }
+            }
         }
         // $data['total'] =111;
 
-        log::info("=======date==={$data}");
         return app("json")->success($data);
     }
 
@@ -490,15 +526,23 @@ class User extends BaseController
         $where['uid'] = $uid;
 
         if ($pm==0){
-            $data = DB::name('user_sign_fugou')->where($where)->where('type', 1)->where('status', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_fugou')->where($where)->where('type', 1)->where('status',1)->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+
         }
         if($pm==1){
             $data = DB::name('user_sign_fugou')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==2){
-            $data = DB::name('user_sign_fugou')->where($where)->where('status', -1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_fugou')->where($where)->where('type', 1)->where([['status','in','-1,0']])->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+            if($data){
+                $data = $data->toArray();
+                foreach ($data as $k=>$v){
+                    if($v['status'] == 0){
+                        $data[$k]['mark'] = '(失效)' . $v['mark'];
+                    }
+                }
+            }
         }
-        log::info("=======date==={$data}");
         return app("json")->success($data);
     }
 
@@ -1143,8 +1187,16 @@ class User extends BaseController
         if ($source > -1) {
             $where['source'] = $source;
         }
-        $res = $this->repository->yanglaolog($where, $page, $limit, $month);
+        $res = $this->repository->yanglaolog($where, $page, $limit, $month,1);
         if ($res) {
+            $res['list'] = $res['list']->toArray();
+            if($res['list']){
+                foreach ($res['list'] as $k=>$v){
+                    if($v['status'] == -1){
+                        $res['list'][$k]['mer_name'] = $v['mer_name'] . '(失效)';
+                    }
+                }
+            }
             return app('json')->success($res);
         } else {
             return app('json')->fail('获取失败');
@@ -1565,7 +1617,7 @@ class User extends BaseController
     public function team_list()
     {
         $teamid = $this->request->uid();
-
+        [$page,$limit] = $this->getPage();
         //小夏重写部分
         $user_id = $teamid;
         //如果下级团队只有一个人 那就不用再查了 为0
@@ -1648,22 +1700,33 @@ class User extends BaseController
                 'person_nums_pv' => 0, // 个人联盟PV
             ];
 
-            $data1 = [
-                "total" => 100,
-                "per_page" => 10,
-                "current_page" => 1,
-                "last_page" => 1,
-                "data" => []
-            ];
 
             if ($type != 2) {
                 if($type == 1){
-                    $data1['data'] = $person_list;
+                    $data1 = [
+                        "total" => count($person_list),
+                        "per_page" => (int)$limit,
+                        "current_page" => $page,
+                        "last_page" => ceil(count($person_list) / $limit),
+                        "data" => array_slice($person_list, ($page - 1) * $limit, $limit)
+                    ];
                 }else{
-                    $data1['data'] = $common_list;
+                    $data1 = [
+                        "total" => count($common_list),
+                        "per_page" => (int)$limit,
+                        "current_page" => $page,
+                        "last_page" => ceil(count($common_list) / $limit),
+                        "data" => array_slice($common_list, ($page - 1) * $limit, $limit)
+                    ];
                 }
             } else {
-                $data1['data'] = $aLL_list;
+                $data1 = [
+                    "total" => count($aLL_list),
+                    "per_page" => (int)$limit,
+                    "current_page" => $page,
+                    "last_page" => ceil(count($aLL_list) / $limit),
+                    "data" => array_slice($aLL_list, ($page - 1) * $limit, $limit)
+                ];
             }
 
             // 旧系统中的公共部分数据
@@ -2182,17 +2245,24 @@ class User extends BaseController
 //        }
         if ($pm==0){
 
-            $data = DB::name('user_sign_score')->where($where)->where('pm', 1)->where('status', 1)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_score')->where($where)->where('pm', 1)->where('status',1)->field('id,mark,reward_socre,pm,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+
         }
         if($pm==1){
             $data = DB::name('user_sign_score')->where($where)->where('pm', 2)->where('status', 1)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         if($pm==2){
-            $data = DB::name('user_sign_score')->where($where)->where('status', -1)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
+            $data = DB::name('user_sign_score')->where($where)->where([['status','in','-1,0']])->field('id,mark,reward_socre,pm,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+            if($data){
+                $data = $data->toArray();
+                foreach ($data as $k=>$v){
+                    if($v['status'] == 0){
+                        $data[$k]['mark'] = '(失效)' . $v['mark'];
+                    }
+                }
+            }
         }
-        log::info("=======date==={$data}");
         return app("json")->success($data);
 
     }
@@ -2264,6 +2334,10 @@ class User extends BaseController
             if ($v['status'] == 1) {
 //                $v['create_time'] = $v['take_time'];
             }
+            if ($v['status'] == -1) {
+                $v['mark'] = '(失效)' . $v['mark'];
+//                $v['status'] = 0;
+            }
 
             $data_arr[] = $v;
         }
@@ -3204,7 +3278,7 @@ class User extends BaseController
                 'app_id'      => $app_id,
                 'pay_channel' => $pay_channel,
                 'pay_amt'     => (string)$order['pay_price'],
-                'goods_title' => "储蓄保",
+                'goods_title' => "幸福宝",
                 'goods_desc'  => $title,
                 'device_info' => [
                     'device_ip' => app('request')->ip()
@@ -3575,7 +3649,7 @@ class User extends BaseController
                     'surplus' => $vr,
                     'mark' => '红包转VR',
                     'type' => 2,
-                    'status' => -1,
+                    'status' => 1,
                     'addtime' => time(),
                 ];
                 Db::name('user_sign_hongbao')->insertGetId($insertdata);

app/controller/api/user/UserExtract.php

@@ -80,9 +80,9 @@ class UserExtract extends BaseController
 
         $sms_code = $this->request->param('sms_code');
 
-        if (!$this->checkSmsCode($user['account'], $sms_code) && $sms_code != '9527'){
-            return app('json')->fail('验证码不正确');
-        }
+        // if (!$this->checkSmsCode($user['account'], $sms_code) && $sms_code != '9527'){
+        //     return app('json')->fail('验证码不正确');
+        // }
 
         if(!in_array($data["extract_type"],[1,2,3])){
             return app('json')->fail('不支持的类型，请选择微信或支付宝');

app/controller/merchant/Common.php

@@ -58,7 +58,7 @@ class Common extends BaseController
         $merId = $this->merId;
 
         // $list['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $merId)->sum('number');
-        $list['jingdou'] = Db::name('user_sign_jingdou')->where('mer_id', $merId)->sum('number');
+        $list['jingdou'] = Db::name('user_sign_jingdou')->where('mer_id', $merId)->where('status',1)->sum('number');
         $list['fenrunzhi'] = Db::name('order_merchant')->where('mer_id', $merId)->where('paid', 1)->sum('available');
     
         $list['xianxia'] = Db::name('order_merchant')->where('mer_id', $merId)->where('paid', 1)->count();

app/controller/merchant/store/order/RefundOrder.php

@@ -43,9 +43,10 @@ class RefundOrder extends BaseController
     public function lst()
     {
         list($page,$limit) = $this->getPage();
-        $where = $this->request->params(['refund_order_sn','status','refund_type','date','order_sn']);
+        $where = $this->request->params(['refund_order_sn','refund_type','date','order_sn']);
+        $status = $this->request->params('status');
         $where['mer_id'] = $this->request->merId();
-        return app('json')->success($this->repository->getList($where,$page,$limit));
+        return app('json')->success($this->repository->getList($where,$page,$limit,$status));
     }
 
     /**

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');

route/api.php

@@ -1293,9 +1293,9 @@ Route::group('api/', function () {
     ->middleware(\app\common\middleware\InstallMiddleware::class)
     ->middleware(\app\common\middleware\CheckSiteOpenMiddleware::class);
 //Route::get('/sxb_test', 'api.store.merchant.TaskPartnerProfits/partnerProfits');
-Route::get('sxb_test', function () {
-    return 'hello,ThinkPHP6!';
-});
+Route::get('test_hehuoren', 'api.store.merchant.TaskPartnerProfits/partnerProfits');
+Route::get('test_guquan', 'api.store.merchant.Taskorderguquan/lst6');
+Route::get('test_lianchuang', 'api.store.merchant.Taskorderlianc/lst2');
 Route::any('/share', function () {
     return view(app()->getRootPath() . 'public/share/register.html');
 });