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

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

@@ -5,6 +5,7 @@ namespace app\controller\api\store\merchant;
 
 
 use think\facade\Db;
+use think\Request;
 
 class TaskPartnerProfits
 {
@@ -76,7 +77,7 @@ class TaskPartnerProfits
         return floor(array_sum(array_column($redEnvelopeList, 'number')) * 100) / 100;
     }
 
-    public function partnerProfits($startTime = '', $endTime = '')
+    public function partnerProfits(Request $request)
     {
 
         // 由于分红错误 需要对数据进行撤回
@@ -106,8 +107,10 @@ class TaskPartnerProfits
 
         //        return json($user_bill_list);
 
-        $startTime = '2025-03-31';
-        $endTime = '2025-04-06';
+        $startTime = $request->param('startTime', null);
+        $endTime = $request->param('endTime', null);
+        $isTest = $request->param('isTest', 1);
+
         // 查询测试人员账号信息
         //18973958920
         //15186694339
@@ -115,7 +118,7 @@ class TaskPartnerProfits
         //19525470098
         //17756507016
         //18226705337
-        $testAccount = ['18973958920', '15186694339', '18833633835', '19525470098', '17756507016', '18226705337'];
+        $testAccount = ['18973958920', '15186694339', '18833633835', '19525470098', '17756507016', '18226705337', '17855366921'];
         $removeUserList = Db::name("user")
             ->whereIn('account', $testAccount)
             ->where("status", "<>", 0)
@@ -311,42 +314,43 @@ class TaskPartnerProfits
                 //                    $testRecord['fg_fushu'][] = ['uid' => $v, 'num' => floor($allAward * 0.1 * 100) / 100, 'exist' => $user_sign_fugou_uid_list[$v]['number'] ?? 0.00, 'fg' => $fg_10];
                 //                }
 
-
-                $userdatassss = db::name("old_user_jbp")->where("id", $v)->find();
-                $datas_log = [
-                    '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数据表中
-
-                # code...
-                $res = Db::name("user")->where("uid", $v)->inc("total_amount_old", $yj_90)->save();
-
-                Db::name("user")->where("uid", $v)->inc("amount_old", $yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
-                Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
-
-                Db::name("user")->where("uid", $v)->inc("fugou", $fg_10)->save();
-
-
-                //if($res) {
-                $this->change_user_log($v, 'amount_old', 1, $yj_90, "member_award", "星级分红入账" . "-" . $value['title']);//释放佣金
-                //入账星级分红记录表
-                $week_data = [];
-                $week_data['user_id'] = $v;
-                $week_data['user_star_id'] = $value['id'];
-                $week_data['award_num'] = $myWeightMoney;
-                $week_data['award_num_sm'] = $myMixMoney;
-                $week_data['remark'] = "星级分红主动执行:" . $yj_90;
-                $week_data['week_record'] = $weekRecord;
-                $week_data['all_amount'] = $fsMoneyNums;
-                $week_data['radio'] = 2;
-                $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系统
-                $this->fugou_user_log($v, $fg_10, 16, 1, 1);//复购金明细入账
+                if ($isTest == 0) {
+                    $userdatassss = db::name("old_user_jbp")->where("id", $v)->find();
+                    $datas_log = [
+                        '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数据表中
+
+                    # code...
+                    $res = Db::name("user")->where("uid", $v)->inc("total_amount_old", $yj_90)->save();
+
+                    Db::name("user")->where("uid", $v)->inc("amount_old", $yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
+                    Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
+
+                    Db::name("user")->where("uid", $v)->inc("fugou", $fg_10)->save();
+
+
+                    //if($res) {
+                    $this->change_user_log($v, 'amount_old', 1, $yj_90, "member_award", "星级分红入账" . "-" . $value['title']);//释放佣金
+                    //入账星级分红记录表
+                    $week_data = [];
+                    $week_data['user_id'] = $v;
+                    $week_data['user_star_id'] = $value['id'];
+                    $week_data['award_num'] = $myWeightMoney;
+                    $week_data['award_num_sm'] = $myMixMoney;
+                    $week_data['remark'] = "星级分红主动执行:" . $yj_90;
+                    $week_data['week_record'] = $weekRecord;
+                    $week_data['all_amount'] = $fsMoneyNums;
+                    $week_data['radio'] = 2;
+                    $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系统
+                    $this->fugou_user_log($v, $fg_10, 16, 1, 1);//复购金明细入账
+                }
             }
             $salesArr['cs'] = $testRecord;
         }