分红功能微调

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/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;