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

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

@@ -110,6 +110,7 @@ class TaskPartnerProfits
         $startTime = $request->param('startTime', null);
         $endTime = $request->param('endTime', null);
         $isTest = $request->param('isTest', 1);
+        $maxAllocationAmount = $request->param('maxAllocationAmount', null);
 
         // 查询测试人员账号信息
         //18973958920
@@ -142,6 +143,11 @@ class TaskPartnerProfits
         if ($weekRecord <= 0) {
             return json('无效分红金额');
         }
+        if (!is_null($maxAllocationAmount)) {
+            if ($weekRecord > $maxAllocationAmount) {
+                $weekRecord = $maxAllocationAmount;
+            }
+        }
 
 
         // 1、获取用户星级信息

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

@@ -9,6 +9,7 @@ namespace app\controller\api\store\merchant;
 
 use app\common\model\user\User;
 use think\facade\Db;
+use think\Request;
 
 class Taskorderguquan
 {
@@ -30,17 +31,18 @@ class Taskorderguquan
          * 齐玲霞100（13620628844）
          */
         $data = [
-            '13959100621' => 200,
-            '18603401312' => 200,
-            '13701061395' => 100,
-            '13231658486' => 200,
-            '13521438652' => 100,
-            '13161909228' => 100,
-            '13801358713' => 100,
-            '15810064711' => 100,
-            '15960349667' => 100,
-            '15332507711' => 100,
-            '13620628844' => 100,
+            '13231658486' => 600,
+            '13959100621' => 500,
+            '13333069689' => 500,
+            '13701061395' => 500,
+            '17501006833' => 500,
+            '15631982690' => 500,
+            '18603401312' => 400,
+            '13521438652' => 400,
+            '15832971815' => 400,
+            '15810064711' => 400,
+            '13215917919' => 100,
+            '18911752386' => 200,
         ];
         $result = Db::name("user")
             ->whereIn("account", array_keys($data))
@@ -49,8 +51,15 @@ class Taskorderguquan
             ->select();
         $res = [];
         foreach ($result as $v) {
-            Db::name("user")->where("uid", $v['uid'])->inc("brokerage_price", $data[$v['account']])->save();
+            $yj_90 = $data[$v['account']] * 0.9;
+            $fg_10 = $data[$v['account']] * 0.1;
+            Db::name("user")->where("uid", $v['uid'])->inc("brokerage_price", $yj_90)->save();
+            Db::name("user")->where("uid", $v['uid'])->inc("total_amount_old", $yj_90)->save();
+            Db::name("user")->where("uid", $v['uid'])->inc("amount_old", $yj_90)->save();
+            Db::name("user")->where("uid", $v['uid'])->inc("fugou", $fg_10)->save();
+
             $this->bill_user_log111111($v['uid'], "佣金补贴", $data[$v['account']], "佣金补贴", 8);//股权分佣明细2.0系统
+            $this->fugou_user_log($v['uid'], $fg_10, 16, 1, 1);//复购金明细入账
             $res[] = [
                 'uid' => $v['uid'],
                 'account' => $v['account'],
@@ -711,10 +720,12 @@ class Taskorderguquan
 
     }
 
-    public function lst6()
+    public function lst6(Request $request)
     {
-        $startTime = '2025-03-10';
-        $endTime = '2025-03-30';
+        $startTime = $request->param('startTime', null);
+        $endTime = $request->param('endTime', null);
+        $isTest = $request->param('isTest', 1);
+        $maxAllocationAmount = $request->param('maxAllocationAmount', null);
         // 查询测试人员账号信息
         //18973958920
         //15186694339
@@ -722,7 +733,7 @@ class Taskorderguquan
         //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)
@@ -746,6 +757,11 @@ class Taskorderguquan
         if ($weekRecord <= 0) {
             return json('无效分红金额');
         }
+        if (!is_null($maxAllocationAmount)) {
+            if ($weekRecord > $maxAllocationAmount) {
+                $weekRecord = $maxAllocationAmount;
+            }
+        }
 
         // $stock_comm = round($weekRecord * 0.05 ,2);
         $stock_comm = floor(($weekRecord * 0.05) * 100) / 100;
@@ -776,51 +792,52 @@ class Taskorderguquan
 
                 $yj_90 = $v['getcomm'] * 0.9;
                 $fg_10 = $v['getcomm'] * 0.1;
+                if ($isTest == 0) {
+                    // // 更新 user_stock 表中的记录
+                    $res = db::name("old_user_stock")->where("id", $v['id'])->update([
+                        'getcomm' => $v['getcomm'],
+                        'allgetcomm' => $v['allgetcomm'],
+                        '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();
+
+                    $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']);//释放佣金
+
+                        //入账星级分红记录表
+                        $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'] = $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();
+                        $datas_log = [
+                            '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系统
 
-                // // 更新 user_stock 表中的记录
-                $res = db::name("old_user_stock")->where("id", $v['id'])->update([
-                    'getcomm' => $v['getcomm'],
-                    'allgetcomm' => $v['allgetcomm'],
-                    '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();
-
-                $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']);//释放佣金
-
-                    //入账星级分红记录表
-                    $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'] = $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();
-                    $datas_log = [
-                        '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->fugou_user_log($v['user_id'], $fg_10, 16, 1, 1);//复购金明细入账
+                        $this->fugou_user_log($v['user_id'], $fg_10, 16, 1, 1);//复购金明细入账
+                    }
                 }
             }
         }

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

@@ -8,6 +8,7 @@
 namespace app\controller\api\store\merchant;
 
 use think\facade\Db;
+use think\Request;
 
 class Taskorderlianc
 {
@@ -271,10 +272,12 @@ class Taskorderlianc
     }
 
 
-    public function lst2()
+    public function lst2(Request $request)
     {
-        $startTime = '2025-03-10';
-        $endTime = '2025-03-30';
+        $startTime = $request->param('startTime', null);
+        $endTime = $request->param('endTime', null);
+        $isTest = $request->param('isTest', 1);
+        $maxAllocationAmount = $request->param('maxAllocationAmount', null);
         // 查询测试人员账号信息
         //18973958920
         //15186694339
@@ -282,7 +285,7 @@ class Taskorderlianc
         //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)
@@ -306,7 +309,11 @@ class Taskorderlianc
         if ($weekRecord <= 0) {
             return json('无效分红金额');
         }
-
+        if (!is_null($maxAllocationAmount)) {
+            if ($weekRecord > $maxAllocationAmount) {
+                $weekRecord = $maxAllocationAmount;
+            }
+        }
 
         $originator_award = round(($weekRecord * 0.05), 2);
 
@@ -376,39 +383,40 @@ class Taskorderlianc
                 //90给佣金，10给复购金
                 $yj_90 = $award * 0.9;
                 $fg_10 = $award * 0.1;
-
-                Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
-                $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();//不用冻结金额和提现额度来限制佣金发放
-                $res3 = Db::name("user")->where("uid", $v)->inc("fugou", $fg_10)->save();
-
-                $res = true;
-                if ($res) {
-                    $$count = $count + 1;
-                    $this->change_user_log($v, 'amount_old', 1, $yj_90, "relation_profits", "联创分红入账" . "-" . $value['title']);
-                    //入账
-                    $week_data = [];
-                    $week_data['user_id'] = $v;
-                    $week_data['user_lianc_id'] = $value['id'];
-                    $week_data['money'] = $yj_90;
-                    $week_data['remark'] = "联创分红入账主动执行" . $yj_90;
-                    $week_data['all_record'] = $originator_award;
-                    $week_data['all_amount'] = $distribution_money;
-                    $week_data['create_time'] = time();
-                    Db::name("old_user_originator")->insert($week_data);
-
-                    $userdatassss = db::name("user")->where("uid", $v)->find();
-                    $datas_log = [
-                        'note' => "名称:" . $userdatassss['nickname'] . " 用户:" . $v . " 新增联创佣金:" . $yj_90,
-                        'create_time' => date('Y-m-d H:i:s')
-                    ];
-                    Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
-                    $this->bill_user_log111111($v, "联创分佣", $yj_90, "联创明细入账", 12);//股权分佣明细2.0系统
-
-                    $this->fugou_user_log($v, $fg_10, 16, 1, 1);//复购金明细入账
-
-                } else {
-                    // ..
+                if ($isTest == 0) {
+                    Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
+                    $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();//不用冻结金额和提现额度来限制佣金发放
+                    $res3 = Db::name("user")->where("uid", $v)->inc("fugou", $fg_10)->save();
+
+                    $res = true;
+                    if ($res) {
+                        $$count = $count + 1;
+                        $this->change_user_log($v, 'amount_old', 1, $yj_90, "relation_profits", "联创分红入账" . "-" . $value['title']);
+                        //入账
+                        $week_data = [];
+                        $week_data['user_id'] = $v;
+                        $week_data['user_lianc_id'] = $value['id'];
+                        $week_data['money'] = $yj_90;
+                        $week_data['remark'] = "联创分红入账主动执行" . $yj_90;
+                        $week_data['all_record'] = $originator_award;
+                        $week_data['all_amount'] = $distribution_money;
+                        $week_data['create_time'] = time();
+                        Db::name("old_user_originator")->insert($week_data);
+
+                        $userdatassss = db::name("user")->where("uid", $v)->find();
+                        $datas_log = [
+                            'note' => "名称:" . $userdatassss['nickname'] . " 用户:" . $v . " 新增联创佣金:" . $yj_90,
+                            'create_time' => date('Y-m-d H:i:s')
+                        ];
+                        Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
+                        $this->bill_user_log111111($v, "联创分佣", $yj_90, "联创明细入账", 12);//股权分佣明细2.0系统
+
+                        $this->fugou_user_log($v, $fg_10, 16, 1, 1);//复购金明细入账
+
+                    } else {
+                        // ..
+                    }
                 }
             }
         }