Merge branch 'master' into huangfamily

app/command/PensionTasks.php

@@ -87,7 +87,7 @@ class PensionTasks extends Command
         $OrderGzcRepository      = app()->make(OrderGzcRepository::class);
         $OrderMerchantRepository = app()->make(OrderMerchantRepository::class);
         $StoreOrderRepository    = app()->make(StoreOrderRepository::class);
-        $cursor = Db::table('user_bill')
+        $cursor = Db::name('user_bill')
         ->where('status', 1)
         ->where('is_gzc', 0)
         ->where('commission_type', 5)
@@ -95,7 +95,6 @@ class PensionTasks extends Command
         if($cursor) {
             foreach ($cursor as $bill) {
                 $type_shop = $bill['type_shop'] ?? 0;
-
                 switch ($type_shop){
                     case "0":
                         $online = $cursor = Db::table('rrx_store_order')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->where('paid', 1)->find();
@@ -130,7 +129,6 @@ class PensionTasks extends Command
                     default:
                         $online = Db::table('rrx_store_order')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->where('paid', 1)->find();
                 }
-
                 if (!$online) {
                     Log::info($bill['uid'] . '查询不到订单');
                     continue;
@@ -153,24 +151,25 @@ class PensionTasks extends Command
                 $create    = [
                     'uid'          => $online['uid'],
                     'platform_no'  => $orderId,
-                    'account_type' => $online['pay_type'] == 1 ? 3 : 2,
+                    'account_type' => 1,
                     'user_name'    => $certification['user_name'],
                     'mobile'       => $certification['mobile'],
                     'user_card'    => $certification['user_card'],
                     'pension'      => $pension,
-                    'order_type'   => 2,
+                    'order_type'   => $type_shop,
                     'out_trade_no' => $online['order_sn'],
                     'link_id'=> $bill['bill_id']
                 ];
                 $test_user = Db::name('user')->where('uid', $online['uid'])->value('test_user');
-                $check     = Db::name("gzc_logs")->where("link_id", $bill['id'])->where("order_type", 2)->count();
+                $check     = Db::name("gzc_logs")->where("link_id", $bill['bill_id'])->where("order_type", $type_shop)->count();
                 if ($test_user == 0 && $check <= 0) {
                     $OrderGzcRepository->create($create);
                     Db::name('user_bill')
                         ->where('bill_id', $bill['bill_id'])
                         ->where('commission_type', 5)
                         ->update([
-                            'is_gzc'          => 1
+                            'is_gzc'          => 1,
+                            'gzc'             => 1
                         ]);
                 }
             }
@@ -1547,13 +1546,8 @@ class PensionTasks extends Command
         if($order_data) {
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
-                $status = $StoreOrderStatusRepository->getWhere(['order_id' => $online['order_id'], 'change_type' => 'take']);
-                if(!$status) {
-                    continue;
-                }else{
-                    $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                    if($date < $status['change_time']) continue;
-                }
+                $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
+                if($date < $online['create_time']) continue;
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
                     Db::name('store_order')->where('order_id', $online['order_id'])->update(['is_settlement' => 1 ,'settlement_time' => date('Y-m-d H:i:s')]);
@@ -1766,7 +1760,7 @@ class PensionTasks extends Command
                 // 修改积分
                 Db::name('user')
                     ->where('uid', $user_sign_score['uid'])
-                    ->inc('score', (float)$user_sign_score['reward_socre'])
+                    ->inc('score', floatval($user_sign_score['reward_socre']))
                     ->update();
                 Db::name('user_sign_score')
                     ->where('id', $user_sign_score['id'])
@@ -1789,7 +1783,7 @@ class PensionTasks extends Command
                 // 修改红包
                 Db::name('user')
                     ->where('uid', $user_sign_hongbao['uid'])
-                    ->inc('hongbao', (float)$user_sign_hongbao['number'])
+                    ->inc('hongbao', floatval($user_sign_hongbao['number']))
                     ->update();
                 Db::name('user_sign_hongbao')
                     ->where('id', $user_sign_hongbao['id'])
@@ -1813,7 +1807,7 @@ class PensionTasks extends Command
                 // 修改京豆
                 Db::name('user')
                     ->where('uid', $user_sign_jingdou['uid'])
-                    ->inc('jingdou', (float)$user_sign_jingdou['number'])
+                    ->inc('jingdou', floatval($user_sign_jingdou['number']))
                     ->update();
                 Db::name('user_sign_jingdou')
                     ->where('id', $user_sign_jingdou['id'])
@@ -1836,7 +1830,7 @@ class PensionTasks extends Command
                 // 修改复购金
                 Db::name('user')
                     ->where('uid', $user_sign_fugou['uid'])
-                    ->inc('fugou', (float)$user_sign_fugou['number'])
+                    ->inc('fugou', floatval($user_sign_fugou['number']))
                     ->update();
                 Db::name('user_sign_fugou')
                     ->where('id', $user_sign_fugou['id'])
@@ -1860,7 +1854,7 @@ class PensionTasks extends Command
                 // 修改贡献值
                 Db::name('user')
                     ->where('uid', $user_sign_gongxian['uid'])
-                    ->inc('contribute', (float)$user_sign_gongxian['number'])
+                    ->inc('contribute', floatval($user_sign_gongxian['number']))
                     ->update();
                 Db::name('user_sign_gongxian')
                     ->where('id', $user_sign_gongxian['id'])
@@ -1885,7 +1879,7 @@ class PensionTasks extends Command
                 // 修改pv
                 Db::name('user')
                     ->where('uid', $user_pv['uid'])
-                    ->inc('pv', (float)$user_pv['pv'])
+                    ->inc('pv', floatval($user_pv['pv']))
                     ->update();
                 Db::name('user_pv_log')
                     ->where('id', $user_pv['id'])
@@ -1906,10 +1900,18 @@ class PensionTasks extends Command
             ->toArray();
         if($user_bill_list){
             foreach ($user_bill_list as $user_bill) {
-                Db::name('user')
-                    ->where('uid', $user_bill['uid'])
-                    ->inc('brokerage_price', (float)$user_bill['number'])
-                    ->update();
+                if($user_bill['commission_type'] == 5){
+                    Db::name('user')
+                        ->where('uid', $user_bill['uid'])
+                        ->inc('annuity', floatval($user_bill['number']))
+                        ->update();
+                }else{
+                    Db::name('user')
+                        ->where('uid', $user_bill['uid'])
+                        ->inc('brokerage_price', floatval($user_bill['number']))
+                        ->update();
+                }
+
                 Db::name('user_bill')
                     ->where('bill_id', $user_bill['bill_id'])
                     ->update([

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

@@ -9472,7 +9472,6 @@ class StoreOrderRepository extends BaseRepository
                     if (!empty($get_cer_datas['user_card'])) {
 
                         $sm_status = 1;
-                        $ds = 1;
                         Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 1]);
 
                         //添加养老金到公证处日志
@@ -9493,27 +9492,6 @@ class StoreOrderRepository extends BaseRepository
                         Db::name('gzc_logs')->insert($ylj_data_log);
 
                     } 
-                }else {
-                    Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 0]);
-
-                      //添加养老金到公证处日志
-                    $ylj_data_log = [
-                    //'user_name' => $get_cer_datas['user_name'],
-                    //"mobile" => $get_cer_datas['mobile'],
-                    //"user_card" => $get_cer_datas['user_card'],//身份证
-                    "pension" => $num,//养老金额度
-                    "out_trade_no" => $order_from_mer['order_sn'],//订单号
-                    "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
-                    "order_type" => 2,//订单类型(2:)
-                    "pay_time" => date('Y-m-d H:i:s'),
-                    "create_time" => date('Y-m-d H:i:s'),
-                    "update_time" => date('Y-m-d H:i:s'),
-                    "uid" => $uid,
-
-                    ];
-
-                    Db::name('gzc_logs')->insert($ylj_data_log);
-
                 }
 
             }
@@ -9851,7 +9829,7 @@ class StoreOrderRepository extends BaseRepository
                 $pv = bcmul($concession_pri, 0.35, 2); // 35%做业绩PV分配
 
                 // 让利部分30%给消费者做养老金{$ylj_pri}
-                $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $group_order['group_order_sn'], '购买商贸区商品获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
+                $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $store_order_data['order_sn'], '购买商贸区商品获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
                 // 购买商贸区赠送贡献值
                 $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
                 // 购买商贸区赠送PV值
@@ -9879,9 +9857,9 @@ 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'], '推广获得佣金', $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, $group_order['group_order_sn'], '推广获得养老金' . round($pv * 0.05, 2), $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'], '推广获得养老金' . round($pv * 0.05, 2), $store_order_data['mer_id'], 0);
                     }
 
                     //普通用户推广人
@@ -9894,7 +9872,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'], '推广获得佣金', $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'], 12, "推广商贸区商品赠送贡献值");
                         // 积分
@@ -9912,7 +9890,7 @@ 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'], '推广获得佣金', $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);
                     }
                     /** @var OrderMerchantRepository $orderMerchantRepository */
                     $orderMerchantRepository = app()->make(OrderMerchantRepository::class);

app/common/repositories/user/UserThirdRepository.php

@@ -747,7 +747,7 @@ class UserThirdRepository extends BaseRepository
     /**
      * 添加预估积分记录
      */
-    public function yuguJifen($price,$user_id,$order_sn,$type_shop)
+    public function yuguJifen($order_id,$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"]);
@@ -757,7 +757,7 @@ class UserThirdRepository extends BaseRepository
         $user_sign_score_list = Db::name('user_sign_score')
             ->where('uid', $user_id)
             ->where('order_type', $type_shop)
-            ->where('order_id', $order_sn)
+            ->where('order_id', $order_id)
             ->find();
         if (!empty($user_sign_score_list)) {
             Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_sn, $order_sn, 赠送积分, 订单已存在积分发放记录"]);
@@ -805,7 +805,7 @@ class UserThirdRepository extends BaseRepository
                 "addtime"       =>  time(),
                 "status"        =>  -1,
                 "order_type"    =>  $type_shop,
-                "order_id"      =>  $order_sn,
+                "order_id"      =>  $order_id,
                 "mark"          =>  "购买{$make}商品赠送积分",
                 "surplus"       =>  $surplus,
                 "pm"            =>  1,
@@ -823,7 +823,7 @@ class UserThirdRepository extends BaseRepository
                 "addtime"       =>time(),
                 "status"        =>-1,
                 "order_type"    =>$type_shop,
-                "order_id"      =>$order_sn,
+                "order_id"      =>$order_id,
                 "mark"          =>"购买{$make}商品赠送贡献值",
                 "desc"          =>'',
                 "surplus"       =>$surplusgongxian+$gxzongwei,
@@ -839,7 +839,7 @@ class UserThirdRepository extends BaseRepository
                 "addtime"       =>time(),
                 "status"        =>-1,
                 "order_type"    =>$type_shop,
-                "order_id"      =>$order_sn,
+                "order_id"      =>$order_id,
                 "mark"          =>"购买{$make}商品获得的PV",
             ];
             Db::name("user_pv_log")->insert($pv_data);//添加pv记录
@@ -854,7 +854,7 @@ class UserThirdRepository extends BaseRepository
                     "addtime"       =>time(),
                     "status"        =>-1,
                     "order_type"    =>$type_shop,
-                    "order_id"      =>$order_sn,
+                    "order_id"      =>$order_id,
                     "mark"          =>"购买{$make}商品赠送红包",
                     "desc"          =>'',
                     "surplus"       =>$hongbao,
@@ -884,7 +884,7 @@ class UserThirdRepository extends BaseRepository
                     "addtime"       =>  time(),
                     "status"        =>  -1,
                     "order_type"    =>  $type_shop,
-                    "order_id"      =>  $order_sn,
+                    "order_id"      =>  $order_id,
                     "mark"          =>  "推广{$make}商品赠送积分",
                     "surplus"       =>  $sprerdUser['score'] + $tuiguanyongjin,
                     "pm"            =>  1,
@@ -904,7 +904,7 @@ class UserThirdRepository extends BaseRepository
                     "addtime"       =>time(),
                     "status"        =>-1,
                     "order_type"    =>$type_shop,
-                    "order_id"      =>$order_sn,
+                    "order_id"      =>$order_id,
                     "mark"          =>"推广{$make}商品赠送贡献值",
                     "desc"          =>'',
                     "surplus"       => $sprerdUser['contribute'] + $gongxian,

app/controller/admin/user/User.php

@@ -810,6 +810,43 @@ class User extends BaseController
             return app('json')->fail("失败");
         }
     }
+
+    /**
+     * 修改用户奖励表单
+     * @param $id
+     * @return mixed
+     * @throws FormBuilderException
+     */
+    public function changeAwardForm($id)
+    {
+        if (!$this->repository->exists($id))
+            return app('json')->fail('数据不存在');
+        return app('json')->success(formToData($this->repository->changeAwardForm($id)));
+    }
+
+
+    /**
+     * 修改用户奖励
+     * @param $id
+     * @param UserRepository $repository
+     * @return mixed
+     */
+    public  function  changeAward($id,UserRepository $repository)
+    {
+        $type = $this->request->param('type');
+        $award_type = $this->request->param('award_type');
+        $num = $this->request->param('num');
+        $mark = $this->request->param('mark','');
+        $admin_id = $this->request->param('admin_id');
+        if (!$id || !$award_type || !$num){
+            return app('json')->fail('参数丢失');
+        }
+        if($repository->changeAward($id,$type,$award_type,$num,$mark,$admin_id)){
+            return app('json')->success("修改成功");
+        }else{
+            return app('json')->fail("失败");
+        }
+    }
     /**
      * @param $id
      * @return mixed

app/controller/api/Notify.php

@@ -626,7 +626,7 @@ class Notify
                                     $pv = bcmul($concession_pri, 0.35, 2); // 35%做业绩PV分配
 
                                     // 让利部分30%给消费者做养老金{$ylj_pri}
-                                    $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $group_order['group_order_sn'], '购买商贸区商品获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
+                                    $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $store_order_data['order_sn'], '购买商贸区商品获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
                                     // 购买商贸区赠送贡献值
                                     $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
                                     // 购买商贸区赠送PV值
@@ -682,7 +682,7 @@ 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'], '推广获得佣金', $user_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'], '推广获得佣金', $user_data['mer_id'], 0);
                                         }
                                     }
 
@@ -1668,27 +1668,6 @@ class Notify
                         Db::name('gzc_logs')->insert($ylj_data_log);
 
                     } 
-                }else {
-                    Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 0]);
-
-                      //添加养老金到公证处日志
-                    $ylj_data_log = [
-                    //'user_name' => $get_cer_datas['user_name'],
-                    //"mobile" => $get_cer_datas['mobile'],
-                    //"user_card" => $get_cer_datas['user_card'],//身份证
-                    "pension" => $num,//养老金额度
-                    "out_trade_no" =>  $order_from_mer['order_sn'],//订单号
-                    "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
-                    "order_type" => 2,//订单类型(2:)
-                    "pay_time" => date('Y-m-d H:i:s'),
-                    "create_time" => date('Y-m-d H:i:s'),
-                    "update_time" => date('Y-m-d H:i:s'),
-                    "uid" => $uid,
-
-                    ];
-
-                    Db::name('gzc_logs')->insert($ylj_data_log);
-
                 }
                 $ds = 1;
             }

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

@@ -78,8 +78,36 @@ class TaskPartnerProfits
 
     public function partnerProfits($startTime = '', $endTime = '')
     {
-        $startTime = '2025-03-10';
-        $endTime = '2025-03-30';
+
+        // 由于分红错误 需要对数据进行撤回
+        //        $user_bill_list = Db::name("user_bill")
+        //            ->where("title", '合伙人分佣')
+        //            ->where("status", 1)
+        //            ->whereBetween('create_time', ['2025-04-07 16:46:56', '2025-04-07 16:47:02'])
+        //            ->select()
+        //            ->toArray();
+        //        $user_bill_uid_list = array_column($user_bill_list, null, 'uid');
+        //
+        //        $user_sign_fugou_list = Db::name("user_sign_fugou")
+        //            ->where("mark", '复购金')
+        //            ->where("status", 1)
+        //            ->whereBetween('settlement_time', ['2025-04-07 16:46:56', '2025-04-07 16:47:02'])
+        //            ->select()
+        //            ->toArray();
+        //        $user_sign_fugou_uid_list = array_column($user_sign_fugou_list, null, 'uid');
+        //
+        //        $old_user_weekaward_list = Db::name("old_user_weekaward")
+        ////            ->where("mark", '复购金')
+        ////            ->where("status", 1)
+        //            ->whereBetween('create_time', [1744015616, 1744015622])
+        //            ->select()
+        //            ->toArray();
+        //        $old_user_weekaward_list = array_column($old_user_weekaward_list, null, 'uid');
+
+        //        return json($user_bill_list);
+
+        $startTime = '2025-03-31';
+        $endTime = '2025-04-06';
         // 查询测试人员账号信息
         //18973958920
         //15186694339
@@ -250,14 +278,14 @@ class TaskPartnerProfits
                 //返回是数组，下标0是最小的值(业绩小的)，下标1是最大的值(业绩大的)
                 $userPvSmallNum = $value['dividerPeoplePv'][$v]['sumOfOthers'] ?? 0;
                 //                $myMixMoney = round($amount * ($userPvSmallNum / $sumOfOthersAll), 2);
-                $myMixMoney = floor(($amount * (floor(($userPvSmallNum / $sumOfOthersAll) * 1000) / 1000)) * 100) / 100;
+                $myMixMoney = floor(($amount * (floor(($userPvSmallNum / $sumOfOthersAll) * 100000) / 100000)) * 100) / 100;
 
                 //个人双区总佣金 权重 计算
                 $myBill = $value['dividerPeoplePv'][$v]['maxValue'] ?? 0;
                 //中级合伙人。userid=17可以分到双区可分红的金额
                 //可分红的佣金 * (中级合伙人个人的双区总业绩 / 当前等级所有合伙人的双联盟业绩) = 当前用户可以获取到的分红佣金(双区联盟总业绩加权佣金),287742 * (61.95/431032)=41.36
                 //                $myWeightMoney = round($amount * ($myBill / $maxValueAll), 2);
-                $myWeightMoney = floor(($amount * (floor((($myBill + $userPvSmallNum) / ($maxValueAll + $sumOfOthersAll)) * 1000) / 1000)) * 100) / 100;
+                $myWeightMoney = floor(($amount * (floor((($myBill + $userPvSmallNum) / ($maxValueAll + $sumOfOthersAll)) * 100000) / 100000)) * 100) / 100;
 
 
                 $salesArr[$key]['dividerPeoplePv'][$v]['myWeightMoney'] = $myWeightMoney;
@@ -269,8 +297,19 @@ class TaskPartnerProfits
                 $allAward = $myWeightMoney + $myMixMoney;
 
                 //90%给佣金，10给复购金
-                $yj_90 = $allAward * 0.9;
-                $fg_10 = $allAward * 0.1;
+                $yj_90 = floor($allAward * 0.9 * 100) / 100;
+                $fg_10 = floor($allAward * 0.1 * 100) / 100;
+
+                //                $yj_90 = bcsub($yj_90, $user_bill_uid_list[$v]['number'] ?? 0.00, 2);
+                //
+                //                $fg_10 = bcsub($fg_10, $user_sign_fugou_uid_list[$v]['number'] ?? 0.00, 2);
+                //
+                //                if ($yj_90 < 0) {
+                //                    $testRecord['yj_fushu'][] = ['uid' => $v, 'num' => floor($allAward * 0.9 * 100) / 100, 'exist' => $user_bill_uid_list[$v]['number'] ?? 0.00, 'yj' => $yj_90];
+                //                }
+                //                if ($fg_10 < 0) {
+                //                    $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();
@@ -309,7 +348,7 @@ class TaskPartnerProfits
                 $this->bill_user_log111111($v, "合伙人分佣", $yj_90, "合伙人分佣明细入账", 11);//联创分佣明细2.0系统
                 $this->fugou_user_log($v, $fg_10, 16, 1, 1);//复购金明细入账
             }
-
+            $salesArr['cs'] = $testRecord;
         }
         return json($salesArr);
     }
@@ -320,13 +359,13 @@ class TaskPartnerProfits
     public function getSpreadUserUidListByUidList(array $uidList)
     {
         $son_ids = Db::name("user")
-            ->whereIn("spread_uid", $uidList)
-            ->field("uid,spread_uid")
+            ->whereIn("level_id", $uidList)
+            ->field("uid,level_id")
             ->select()
             ->toArray();
         $new_array_ids = [];
         foreach ($son_ids as $key => $value) {
-            $new_array_ids[$value['spread_uid']][] = $value['uid'];
+            $new_array_ids[$value['level_id']][] = $value['uid'];
         }
         return $new_array_ids;
     }
@@ -354,8 +393,8 @@ class TaskPartnerProfits
     public function getSpreadUserUidAccountListByUidList($uid, $account = '')
     {
         $son_ids = Db::name("user")
-            ->where("spread_uid", $uid)
-            ->field("uid,spread_uid,account")
+            ->where("level_id", $uid)
+            ->field("uid,level_id,account")
             ->select()
             ->toArray();
         $new_array_ids = [];
@@ -363,7 +402,7 @@ class TaskPartnerProfits
             $childList = $this->getSpreadUserUidAccountListByUidList($value['uid'], $value['account']);
             $new_array_ids[] = [
                 '当前用户ID' => $value['uid'],
-                '当前用户的上级用户ID' => $value['spread_uid'],
+                '当前用户的上级用户ID' => $value['level_id'],
                 '用户账号（手机号）' => $value['account'],
                 '当前用户的下级用户列表' => $childList
             ];
@@ -381,7 +420,7 @@ class TaskPartnerProfits
     private function getSubordinatesRecursively(int $uid, array &$subordinates = []): array
     {
         $subUidList = Db::name("user")
-            ->where("spread_uid", $uid)  // 直接使用 $uid, 不需要 whereIn
+            ->where("level_id", $uid)  // 直接使用 $uid, 不需要 whereIn
             ->field("uid") //只需要查询uid
             ->select()
             ->toArray();
@@ -405,7 +444,7 @@ class TaskPartnerProfits
     public function getAllSubordinates(int $uid, array &$allSubordinates = []): array
     {
         $subUidList = Db::name("user")
-            ->where("spread_uid", $uid)
+            ->where("level_id", $uid)
             ->column("uid");  // 使用 column 方法直接获取 uid 数组
 
         if (!empty($subUidList)) {
@@ -439,7 +478,7 @@ class TaskPartnerProfits
                 }
                 $processed[] = $currentUid;
                 $subUidList = Db::name("user")
-                    ->where("spread_uid", $currentUid)
+                    ->where("level_id", $currentUid)
                     ->column("uid");
 
                 if (!empty($subUidList)) {
@@ -470,8 +509,8 @@ class TaskPartnerProfits
             if (empty($currentUids)) continue;  //没有新的需要处理的
             $processed = array_merge($processed, $currentUids);//记录
             $subUidList = Db::name("user")
-                ->whereIn("spread_uid", $currentUids)
-                ->field("uid,spread_uid") // 需要查询 spread_uid 用于后续分组
+                ->whereIn("level_id", $currentUids)
+                ->field("uid,level_id") // 需要查询 level_id 用于后续分组
                 ->select()
                 ->toArray();
 
@@ -487,7 +526,7 @@ class TaskPartnerProfits
         }
         $allSubordinatesMap = [];
         foreach ($allSubordinates as $item) {
-            $allSubordinatesMap[$item['spread_uid']][] = $item['uid'];
+            $allSubordinatesMap[$item['level_id']][] = $item['uid'];
         }
 
         //3. 递归的将查到的下级进行分组

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

@@ -15,6 +15,53 @@ class Taskorderguquan
 
     public function assignment()
     {
+        /**
+         * 本周补贴人员名单
+         * 周金花200（13959100621）
+         * 黄金花200（18603401312）
+         * 李素红100（13701061395）
+         * 周行体200（13231658486）
+         * 徐立苹100（13521438652）
+         * 刘银霞100（13161909228）
+         * 金    波100（13801358713）
+         * 王   玲 100（15810064711）
+         * 吕丽娣100（15960349667）
+         * 张传莲100（15332507711）
+         * 齐玲霞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,
+        ];
+        $result = Db::name("user")
+            ->whereIn("account", array_keys($data))
+            ->where('is_del', 0)
+            ->field('uid, brokerage_price, account, nickname')
+            ->select();
+        $res = [];
+        foreach ($result as $v) {
+            Db::name("user")->where("uid", $v['uid'])->inc("brokerage_price", $data[$v['account']])->save();
+            $this->bill_user_log111111($v['uid'], "佣金补贴", $data[$v['account']], "佣金补贴", 8);//股权分佣明细2.0系统
+            $res[] = [
+                'uid' => $v['uid'],
+                'account' => $v['account'],
+                'brokerage_price_pre' => $v['brokerage_price'],
+                'brokerage_price' => $data[$v['account']],
+                'nickname' => $v['nickname']
+            ];
+        }
+        return json($res);
+
+
         $result = [
             'oldOrderExistGongXian' => [],
             'orderExistGongXian' => [],

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

@@ -389,6 +389,7 @@ class DaTaoKe
                 //预估积分
                 log::info("===待进入积分");
                 $orderThird->yuguJifen(
+                    $localOrder['order_tb_id'],
                     $localOrder['commission'],
                     $localOrder['uid'],
                     $localOrder['order_sn'],

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

@@ -623,6 +623,7 @@ class Jd extends BaseController
                     'order_jd');
                 //预估积分
                 $orderThird->yuguJifen(
+                    $order['jd_id'],
                     $order['commission'],
                     $order['uid'],
                     $order['order_sn'],

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

@@ -834,6 +834,7 @@ class Jt extends BaseController
                 $yanglaojin = $yanglaojin_order['extension_one'] ?? 0;
                 //预估积分
                 $orderThird->yuguJifen(
+                    $localOrder['order_jd_id'],
                     $localOrder['commission'],
                     $localOrder['uid'],
                     $localOrder['order_sn'],

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

@@ -777,6 +777,7 @@ class Su extends BaseController
                     'order_su');
                 //预估积分
                 $orderThird->yuguJifen(
+                    $localOrder['order_jd_id'],
                     $order['commission'],
                     $order['uid'],
                     $order['order_sn'],

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

@@ -910,6 +910,7 @@ class TaoKe extends BaseController
                     'order_pdd');
                 //预估积分
                 $orderThird->yuguJifen(
+                    $localOrder['order_pdd_id'],
                     $localOrder['commission'] ,
                     $localOrder['uid'],
                     $localOrder['order_sn'],

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

@@ -914,6 +914,7 @@ class Vip extends BaseController
                     'order_vip');
                 //预估积分
                 $orderThird->yuguJifen(
+                    $localOrder['order_vip_id'],
                     $localOrder['commission'],
                     $localOrder['uid'],
                     $localOrder['order_sn'],

app/controller/api/user/User.php

@@ -328,6 +328,8 @@ class User extends BaseController
                 'team_gongxian_num' => $result['arriveNumTeam'],
                 'zhitui' => $result['perContribute'],
                 'total_source' => $result['contribute'],
+                'largeContribute' => $result['largeContribute'],
+                'subordinate' => $result['subordinate'],
                 'isNormalUser' => $isNormalUser
             ];
             return app('json')->success($data);

route/admin.php

@@ -369,6 +369,9 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             //修改用户推广人
             Route::get('change_pro/form/:id', '/changeProForm')->name('systemUserChangeProForm');
             Route::post('change_pro/:id', '/changePro')->name('systemUserChangePro');
+            //用户奖励变更
+            Route::get('change_award/form/:id', '/changeAwardForm')->name('systemUserChangeAwardForm');
+            Route::post('change_award/:id', '/changeAward')->name('systemUserChangeAward');
             //修改用户密码
             Route::get('change_pass/form/:id', '/changePassForm')->name('systemUserChangePassForm');
             Route::post('change_pass/:id', '/changePass')->name('systemUserChangePass');