Merge branch 'master' into dev

app/command/CinemaSchedCommand.php

@@ -37,6 +37,8 @@ class CinemaSchedCommand extends Command
             foreach ($result['cinema_list'] as $key => $value) {
                 foreach ($filmResult['film_list'] as $subKey => $subValue) {
                     $this->doCinemaSched($subValue, $value);
+//                    if ($subValue['film_sign'] == 'F6556061D4' && $value['cinema_sign'] == 'CCB622D8D8') {
+//                    }
                 }
             }
         } catch (\Exception $exception) {

app/command/PensionTasks.php

@@ -58,6 +58,7 @@ class PensionTasks extends Command
             $this->doThridVipOrderGzc($nowTime, $timeLimit = 2);
             $this->doThridDyOrderGzc($nowTime, $timeLimit = 2);
             $this->doThridHfOrderGzc($nowTime, $timeLimit = 2);
+            $this->billGzcAdd($nowTime);
             //升级
 //            $this -> doUpgrade();
         } catch (\Throwable $e) {
@@ -68,6 +69,109 @@ class PensionTasks extends Command
         $output->writeln('pensiontask');
     }
 
+
+    /**
+     * 线下支付订单公证处IN10入账
+     * @param $nowTime
+     * author: php迷途小书童
+     * created: 2021/3/20 9:26
+     */
+    public function billGzcAdd($nowTime)
+    {
+        $OrderGzcRepository      = app()->make(OrderGzcRepository::class);
+        $OrderMerchantRepository = app()->make(OrderMerchantRepository::class);
+        $StoreOrderRepository    = app()->make(StoreOrderRepository::class);
+        $cursor = Db::table('user_bill')
+        ->where('status', 1)
+        ->where('is_gzc', 0)
+        ->where('commission_type', 5)
+        ->select()->toArray();
+        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();
+                    break;
+                case "1":
+                    $online = Db::table('rrx_order_pdd')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
+                    break;
+                case "2":
+                    $online =  Db::table('rrx_order_vip')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
+                    break;
+                case "3":
+                    $online = Db::table('rrx_order_su')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
+                    break;
+                case "4":
+                    $online = '';
+                    break;
+                case "5":
+                    $online = Db::table('rrx_order_tb')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
+                    break;
+                case "6":
+                    $online = Db::table('rrx_order_jd')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
+                    break;
+                case "7":
+                    $online = '';
+                    break;
+                case "8":
+                    $online = '';
+                    break;
+                case "9":
+                    $online = Db::table('rrx_order_huafei')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
+                    break;
+                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;
+            }   
+
+            $certification = UserCertification::getInstance()->where('uid', $bill['uid'])->find();
+            if (!$certification) {
+                Log::info($online['uid'] . '没有实名认证');
+                continue;
+            }   
+
+            $pension = $bill['number'] ?? 0;
+            if ($pension <= 0) {
+                Log::info($online['order_sn'] . 'pension' . $pension);
+                continue;
+            }
+
+            //新增入账明细记录
+            $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
+            $create    = [
+                'uid'          => $online['uid'],
+                'platform_no'  => $orderId,
+                'account_type' => $online['pay_type'] == 1 ? 3 : 2,
+                'user_name'    => $certification['user_name'],
+                'mobile'       => $certification['mobile'],
+                'user_card'    => $certification['user_card'],
+                'pension'      => $pension,
+                'order_type'   => 2,
+                '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();
+            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
+                ]);
+            }
+        }
+
+    }
+
+
+
     /**
      * 线下支付订单公证处IN10入账
      * @param $nowTime
@@ -108,56 +212,52 @@ class PensionTasks extends Command
                 Log::info($offline['pay_user_id'] . '未绑定用户');
                 continue;
             }
-            $certification = UserCertification::getInstance()->where('uid', $uid)->find();
-            if (!$certification) {
-                Log::info($offline['pay_user_id'] . '未实名认证');
-                continue;
-            }
+            // $certification = UserCertification::getInstance()->where('uid', $uid)->find();
+            // if (!$certification) {
+            //     Log::info($offline['pay_user_id'] . '未实名认证');
+            //     continue;
+            // }
             //查询养老金金额
             $UserBillRepository = app()->make(UserBillRepository::class);
             $bill               = $UserBillRepository->getWhere(['uid' => $uid, 'link_id' => $offline['id'], 'order_sn' => $offline['out_trade_no'], 'title' => '养老金']);
 
-//            if ($bill->status == 0) {
-//                Log::info($offline['out_trade_no'] . 'pension未交年费');
-//                continue;
-//            }
-
             $pension = $bill->number ?? 0;
-            if ($pension <= 0) {
-                Log::info($offline['out_trade_no'] . 'pension' . $pension);
-                continue;
-            }
+            // if ($pension <= 0) {
+            //     Log::info($offline['out_trade_no'] . 'pension' . $pension);
+            //     continue;
+            // }
 
-            Db::transaction(function () use ($uid, $certification, $accountType, $offline, $OrderGzcRepository, $OrderMerchantRepository, $pension, $StoreOrderRepository) {
+            // Db::transaction(function () use ($uid, $certification, $accountType, $offline, $OrderGzcRepository, $OrderMerchantRepository, $pension, $StoreOrderRepository) {
+            Db::transaction(function () use ($uid, $accountType, $offline, $OrderGzcRepository, $OrderMerchantRepository, $pension, $StoreOrderRepository) {
                 $order                  = OrderMerchant::getInstance()->find($offline['id']);
                 $order->gzc             = 1;
                 $order->is_settlement   = 1;
                 $order->settlement_time = date('Y-m-d H:i:s');
                 $order->save();
                 //新增入账明细记录
-                $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
-                $create    = [
-                    'uid'          => $uid,
-                    'platform_no'  => $orderId,
-                    'account_type' => $accountType,
-                    'user_name'    => $certification['user_name'],
-                    'mobile'       => $certification['mobile'],
-                    'user_card'    => $certification['user_card'],
-                    'pension'      => $pension,
-                    'order_type'   => 1,
-                    'out_trade_no' => $offline['out_trade_no']
-                ];
-                $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
-                if ($test_user == 0) {
-                    $OrderGzcRepository->create($create);
-                }
-                // 养老金区域奖励
-                $order_data = [
-                    'pay_price'        => $pension,
-                    'user_address_ids' => $offline['user_address_ids'],
-                    'uid'              => $offline['uid'],
-                    'order_sn'         => $offline['out_trade_no']
-                ];
+                // $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
+                // $create    = [
+                //     'uid'          => $uid,
+                //     'platform_no'  => $orderId,
+                //     'account_type' => $accountType,
+                //     'user_name'    => $certification['user_name'],
+                //     'mobile'       => $certification['mobile'],
+                //     'user_card'    => $certification['user_card'],
+                //     'pension'      => $pension,
+                //     'order_type'   => 1,
+                //     'out_trade_no' => $offline['out_trade_no']
+                // ];
+                // $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
+                // if ($test_user == 0) {
+                //     $OrderGzcRepository->create($create);
+                // }
+                // // 养老金区域奖励
+                // $order_data = [
+                //     'pay_price'        => $pension,
+                //     'user_address_ids' => $offline['user_address_ids'],
+                //     'uid'              => $offline['uid'],
+                //     'order_sn'         => $offline['out_trade_no']
+                // ];
 //                $StoreOrderRepository->area_manage_details($order_data, 0, 2);
 
 
@@ -469,48 +569,53 @@ class PensionTasks extends Command
                 }
             }
 
-            $certification = UserCertification::getInstance()->where('uid', $online['uid'])->find();
-            if (!$certification) {
-                Log::info($online['uid'] . '没有实名认证');
-                continue;
-            }   
+            // $certification = UserCertification::getInstance()->where('uid', $online['uid'])->find();
+            // if (!$certification) {
+            //     Log::info($online['uid'] . '没有实名认证');
+            //     continue;
+            // }   
             //查询养老金金额
             $UserBillRepository = app()->make(UserBillRepository::class);
             $bill               = $UserBillRepository->getWhere(['uid' => $online['uid'], 'link_id' => $online['order_id'], 'order_sn' => $online['order_sn'], 'commission_type' => 5]);
 
             $pension = $bill->number ?? 0;
-            if ($pension <= 0) {
-                Log::info($online['order_sn'] . 'pension' . $pension);
-                continue;
-            }
+            // if ($pension <= 0) {
+            //     Log::info($online['order_sn'] . 'pension' . $pension);
+            //     continue;
+            // }
             //首信易分账
             // $StoreOrderRepository = app()->make(StoreOrderRepository::class);
             // if ($online['pay_type'] > 0) {
             //     $StoreOrderRepository->splitOrder($online);
             // }
 
-            Db::transaction(function () use ($certification, $online, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
+            Db::transaction(function () use ($online, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
                 //新增入账明细记录
-                $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
-                $create    = [
-                    'uid'          => $online['uid'],
-                    'platform_no'  => $orderId,
-                    'account_type' => $online['pay_type'] == 1 ? 3 : 2,
-                    'user_name'    => $certification['user_name'],
-                    'mobile'       => $certification['mobile'],
-                    'user_card'    => $certification['user_card'],
-                    'pension'      => $pension,
-                    'order_type'   => 2,
-                    'out_trade_no' => $online['order_sn']
-                ];
-                $test_user = Db::name('user')->where('uid', $online['uid'])->value('test_user');
-                $check     = Db::name("gzc_logs")->where("out_trade_no", $online['order_sn'])->where("order_type", 2)->count();
-                if ($test_user == 0 && $check <= 0) {
-                    $OrderGzcRepository->create($create);
-                }
+                // $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
+                // $create    = [
+                //     'uid'          => $online['uid'],
+                //     'platform_no'  => $orderId,
+                //     'account_type' => $online['pay_type'] == 1 ? 3 : 2,
+                //     'user_name'    => $certification['user_name'],
+                //     'mobile'       => $certification['mobile'],
+                //     'user_card'    => $certification['user_card'],
+                //     'pension'      => $pension,
+                //     'order_type'   => 2,
+                //     'out_trade_no' => $online['order_sn']
+                // ];
+                // $test_user = Db::name('user')->where('uid', $online['uid'])->value('test_user');
+                // $check     = Db::name("gzc_logs")->where("out_trade_no", $online['order_sn'])->where("order_type", 2)->count();
+                // if ($test_user == 0 && $check <= 0) {
+                //     $OrderGzcRepository->create($create);
+                // }
                 $order                  = StoreOrder::getInstance()->find($online['order_id']);
                 $order->gzc             = 1;
                 $order->save();
+                Db::name('user_bill')
+                ->where('order_sn', $online['order_sn'])
+                ->where('commission_type', 5)
+                ->update(['status'=> 1]);
+
                 // 养老金区域奖励
 //                $order_data = [
 //                    'pay_price'        => $pension,
@@ -523,7 +628,7 @@ class PensionTasks extends Command
             });
         }
 
-        // 普通订单（红包，积分，京东，佣金，复购金，养老金，贡献值）
+        // 普通订单（红包，积分，京东，佣金，复购金，贡献值）
         $cursor = Db::table('rrx_store_order')->where('paid', 1)->where('is_settlement', 0)->where('pay_type', 'in', '0,1,2,4')->cursor();
         $StoreOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
         $OrderMerchantRepository    = app()->make(OrderMerchantRepository::class);
@@ -743,33 +848,36 @@ class PensionTasks extends Command
             $uid = $thrid['uid'];
             if (!$uid)
                 continue;
-            $certification = UserCertification::getInstance()->where('uid', $uid)->find();
-            if (!$certification) {
-                Log::info('用户ID' . $uid . '未实名认证');
-                continue;
-            }
+            // $certification = UserCertification::getInstance()->where('uid', $uid)->find();
+            // if (!$certification) {
+            //     Log::info('用户ID' . $uid . '未实名认证');
+            //     continue;
+            // }
             $pension = $ProductRepository->yanglaojin(0, sprintf('%.2f', $thrid['commission']));
-            Db::transaction(function () use ($uid, $certification, $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
+            Db::transaction(function () use ($uid,  $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
                 //新增入账明细记录
-                $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
-                $create    = [
-                    'uid'          => $uid,
-                    'platform_no'  => $orderId,
-                    'user_name'    => $certification['user_name'],
-                    'mobile'       => $certification['mobile'],
-                    'user_card'    => $certification['user_card'],
-                    'pension'      => $pension,
-                    'order_type'   => 3,
-                    'out_trade_no' => $thrid['order_sn']
-                ];
-                $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
-                if ($test_user == 0) {
-                    $OrderGzcRepository->create($create);
-                }
+                // $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
+                // $create    = [
+                //     'uid'          => $uid,
+                //     'platform_no'  => $orderId,
+                //     'user_name'    => $certification['user_name'],
+                //     'mobile'       => $certification['mobile'],
+                //     'user_card'    => $certification['user_card'],
+                //     'pension'      => $pension,
+                //     'order_type'   => 3,
+                //     'out_trade_no' => $thrid['order_sn']
+                // ];
+                // $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
+                // if ($test_user == 0) {
+                //     $OrderGzcRepository->create($create);
+                // }
 //                $OrderGzcRepository->create($create);
                 Db::table('rrx_order_pdd')
                     ->update(['gzc' => 1, 'order_pdd_id' => $thrid['order_pdd_id']]);
-
+                Db::name('user_bill')
+                    ->where('order_sn', $thrid['order_sn'])
+                    ->where('commission_type', 5)
+                    ->update(['status'=> 1]);
                 // 养老金区域奖励
                 $order_data = [
                     'pay_price'        => $pension,
@@ -807,39 +915,43 @@ class PensionTasks extends Command
             $uid = $thrid['uid'];
             if (!$uid)
                 continue;
-            $certification = UserCertification::getInstance()->where('uid', $uid)->find();
-            if (!$certification) {
-                Log::info('用户ID' . $uid . '未实名认证');
-                continue;
-            }
+            // $certification = UserCertification::getInstance()->where('uid', $uid)->find();
+            // if (!$certification) {
+            //     Log::info('用户ID' . $uid . '未实名认证');
+            //     continue;
+            // }
             $pension = $ProductRepository->yanglaojin(0, sprintf('%.2f', $thrid['commission']));
-            Db::transaction(function () use ($uid, $certification, $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
+            Db::transaction(function () use ($uid, $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
                 //新增入账明细记录
-                $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
-                $create    = [
-                    'uid'          => $uid,
-                    'platform_no'  => $orderId,
-                    'user_name'    => $certification['user_name'],
-                    'mobile'       => $certification['mobile'],
-                    'user_card'    => $certification['user_card'],
-                    'pension'      => $pension,
-                    'order_type'   => 4,
-                    'out_trade_no' => $thrid['order_sn']
-                ];
-                $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
-                if ($test_user == 0) {
-                    $OrderGzcRepository->create($create);
-                }
+                // $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
+                // $create    = [
+                //     'uid'          => $uid,
+                //     'platform_no'  => $orderId,
+                //     'user_name'    => $certification['user_name'],
+                //     'mobile'       => $certification['mobile'],
+                //     'user_card'    => $certification['user_card'],
+                //     'pension'      => $pension,
+                //     'order_type'   => 4,
+                //     'out_trade_no' => $thrid['order_sn']
+                // ];
+                // $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
+                // if ($test_user == 0) {
+                //     $OrderGzcRepository->create($create);
+                // }
 //                $OrderGzcRepository->create($create);
                 Db::table('rrx_order_jd')
                     ->update(['gzc' => 1, 'order_jd_id' => $thrid['order_jd_id']]);
+                Db::name('user_bill')
+                ->where('order_sn', $thrid['order_sn'])
+                ->where('commission_type', 5)
+                ->update(['status'=> 1]);
                 // 养老金区域奖励
-                $order_data = [
-                    'pay_price'        => $pension,
-                    'user_address_ids' => $thrid['user_address_ids'],
-                    'uid'              => $thrid['uid'],
-                    'order_sn'         => $thrid['order_sn']
-                ];
+                // $order_data = [
+                //     'pay_price'        => $pension,
+                //     'user_address_ids' => $thrid['user_address_ids'],
+                //     'uid'              => $thrid['uid'],
+                //     'order_sn'         => $thrid['order_sn']
+                // ];
 //                $StoreOrderRepository->area_manage_details($order_data, 6, 2);
             });
         }
@@ -868,33 +980,36 @@ class PensionTasks extends Command
             $uid = $thrid['uid'];
             if (!$uid)
                 continue;
-            $certification = UserCertification::getInstance()->where('uid', $uid)->find();
-            if (!$certification) {
-                Log::info('用户ID' . $uid . '未实名认证');
-                continue;
-            }
+            // $certification = UserCertification::getInstance()->where('uid', $uid)->find();
+            // if (!$certification) {
+            //     Log::info('用户ID' . $uid . '未实名认证');
+            //     continue;
+            // }
             $pension = $ProductRepository->yanglaojin(0, sprintf('%.2f', $thrid['commission']));
-            Db::transaction(function () use ($uid, $certification, $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
+            Db::transaction(function () use ($uid, $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
                 //新增入账明细记录
-                $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
-                $create    = [
-                    'uid'          => $uid,
-                    'platform_no'  => $orderId,
-                    'user_name'    => $certification['user_name'],
-                    'mobile'       => $certification['mobile'],
-                    'user_card'    => $certification['user_card'],
-                    'pension'      => $pension,
-                    'order_type'   => 5,
-                    'out_trade_no' => $thrid['order_sn']
-                ];
-                $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
-                if ($test_user == 0) {
-                    $OrderGzcRepository->create($create);
-                }
+                // $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
+                // $create    = [
+                //     'uid'          => $uid,
+                //     'platform_no'  => $orderId,
+                //     'user_name'    => $certification['user_name'],
+                //     'mobile'       => $certification['mobile'],
+                //     'user_card'    => $certification['user_card'],
+                //     'pension'      => $pension,
+                //     'order_type'   => 5,
+                //     'out_trade_no' => $thrid['order_sn']
+                // ];
+                // $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
+                // if ($test_user == 0) {
+                //     $OrderGzcRepository->create($create);
+                // }
 //                $OrderGzcRepository->create($create);
                 Db::table('rrx_order_su')
                     ->update(['gzc' => 1, 'order_su_id' => $thrid['order_su_id']]);
-
+                Db::name('user_bill')
+                ->where('order_sn', $thrid['order_sn'])
+                ->where('commission_type', 5)
+                ->update(['status'=> 1]);
                 // 养老金区域奖励
                 $order_data = [
                     'pay_price'        => $pension,
@@ -931,30 +1046,34 @@ class PensionTasks extends Command
             $uid = $thrid['uid'];
             if (!$uid)
                 continue;
-            $certification = UserCertification::getInstance()->where('uid', $uid)->find();
-            if (!$certification) {
-                Log::info('用户ID' . $uid . '未实名认证');
-                continue;
-            }
+            // $certification = UserCertification::getInstance()->where('uid', $uid)->find();
+            // if (!$certification) {
+            //     Log::info('用户ID' . $uid . '未实名认证');
+            //     continue;
+            // }
             $pension = $ProductRepository->yanglaojin(0, sprintf('%.2f', $thrid['commission']));
-            Db::transaction(function () use ($uid, $certification, $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository) {
-                //新增入账明细记录
-                $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
-                $create    = [
-                    'uid'          => $uid,
-                    'platform_no'  => $orderId,
-                    'user_name'    => $certification['user_name'],
-                    'mobile'       => $certification['mobile'],
-                    'user_card'    => $certification['user_card'],
-                    'pension'      => $pension,
-                    'order_type'   => 6,
-                    'out_trade_no' => $thrid['order_sn']
-                ];
-                $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
-                if ($test_user == 0) {
-                    $OrderGzcRepository->create($create);
-                }
+            Db::transaction(function () use ($uid, $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository) {
+                // //新增入账明细记录
+                // $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
+                // $create    = [
+                //     'uid'          => $uid,
+                //     'platform_no'  => $orderId,
+                //     'user_name'    => $certification['user_name'],
+                //     'mobile'       => $certification['mobile'],
+                //     'user_card'    => $certification['user_card'],
+                //     'pension'      => $pension,
+                //     'order_type'   => 6,
+                //     'out_trade_no' => $thrid['order_sn']
+                // ];
+                // $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
+                // if ($test_user == 0) {
+                //     $OrderGzcRepository->create($create);
+                // }
                 Db::table('rrx_order_huafei')->update(['gzc' => 1, 'order_tb_id' => $thrid['order_tb_id']]);
+                Db::name('user_bill')
+                ->where('order_sn', $thrid['order_sn'])
+                ->where('commission_type', 5)
+                ->update(['status'=> 1]);
             });
         }
     }
@@ -984,33 +1103,36 @@ class PensionTasks extends Command
             $uid = $thrid['uid'];
             if (!$uid)
                 continue;
-            $certification = UserCertification::getInstance()->where('uid', $uid)->find();
-            if (!$certification) {
-                Log::info('用户ID' . $uid . '未实名认证');
-                continue;
-            }
+            // $certification = UserCertification::getInstance()->where('uid', $uid)->find();
+            // if (!$certification) {
+            //     Log::info('用户ID' . $uid . '未实名认证');
+            //     continue;
+            // }
             $pension = $ProductRepository->yanglaojin(0, sprintf('%.2f', $thrid['commission']));
-            Db::transaction(function () use ($uid, $certification, $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
+            Db::transaction(function () use ($uid, $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
                 //新增入账明细记录
-                $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
-                $create    = [
-                    'uid'          => $uid,
-                    'platform_no'  => $orderId,
-                    'user_name'    => $certification['user_name'],
-                    'mobile'       => $certification['mobile'],
-                    'user_card'    => $certification['user_card'],
-                    'pension'      => $pension,
-                    'order_type'   => 6,
-                    'out_trade_no' => $thrid['order_sn']
-                ];
-                $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
-                if ($test_user == 0) {
-                    $OrderGzcRepository->create($create);
-                }
+                // $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
+                // $create    = [
+                //     'uid'          => $uid,
+                //     'platform_no'  => $orderId,
+                //     'user_name'    => $certification['user_name'],
+                //     'mobile'       => $certification['mobile'],
+                //     'user_card'    => $certification['user_card'],
+                //     'pension'      => $pension,
+                //     'order_type'   => 6,
+                //     'out_trade_no' => $thrid['order_sn']
+                // ];
+                // $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
+                // if ($test_user == 0) {
+                //     $OrderGzcRepository->create($create);
+                // }
 //                $OrderGzcRepository->create($create);
                 Db::table('rrx_order_tb')
                     ->update(['gzc' => 1, 'order_tb_id' => $thrid['order_tb_id']]);
-
+                Db::name('user_bill')
+                ->where('order_sn', $thrid['order_sn'])
+                ->where('commission_type', 5)
+                ->update(['status'=> 1]);
                 // 养老金区域奖励
                 $order_data = [
                     'pay_price'        => $pension,
@@ -1046,33 +1168,36 @@ class PensionTasks extends Command
             $uid = $thrid['uid'];
             if (!$uid)
                 continue;
-            $certification = UserCertification::getInstance()->where('uid', $uid)->find();
-            if (!$certification) {
-                Log::info('用户ID' . $uid . '未实名认证');
-                continue;
-            }
+            // $certification = UserCertification::getInstance()->where('uid', $uid)->find();
+            // if (!$certification) {
+            //     Log::info('用户ID' . $uid . '未实名认证');
+            //     continue;
+            // }
             $pension = $ProductRepository->yanglaojin(0, sprintf('%.2f', $thrid['commission']));
-            Db::transaction(function () use ($uid, $certification, $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
+            Db::transaction(function () use ($uid, $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
                 //新增入账明细记录
-                $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
-                $create    = [
-                    'uid'          => $uid,
-                    'platform_no'  => $orderId,
-                    'user_name'    => $certification['user_name'],
-                    'mobile'       => $certification['mobile'],
-                    'user_card'    => $certification['user_card'],
-                    'pension'      => $pension,
-                    'order_type'   => 7,
-                    'out_trade_no' => $thrid['order_sn']
-                ];
-                $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
-                if ($test_user == 0) {
-                    $OrderGzcRepository->create($create);
-                }
+                // $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
+                // $create    = [
+                //     'uid'          => $uid,
+                //     'platform_no'  => $orderId,
+                //     'user_name'    => $certification['user_name'],
+                //     'mobile'       => $certification['mobile'],
+                //     'user_card'    => $certification['user_card'],
+                //     'pension'      => $pension,
+                //     'order_type'   => 7,
+                //     'out_trade_no' => $thrid['order_sn']
+                // ];
+                // $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
+                // if ($test_user == 0) {
+                //     $OrderGzcRepository->create($create);
+                // }
 //                $OrderGzcRepository->create($create);
                 Db::table('rrx_order_vip')
                     ->update(['gzc' => 1, 'order_vip_id' => $thrid['order_vip_id']]);
-
+                Db::name('user_bill')
+                    ->where('order_sn', $thrid['order_sn'])
+                    ->where('commission_type', 5)
+                    ->update(['status'=> 1]);
                 // 养老金区域奖励
                 $order_data = [
                     'pay_price'        => $pension,
@@ -1108,32 +1233,35 @@ class PensionTasks extends Command
             $uid = $thrid['uid'];
             if (!$uid)
                 continue;
-            $certification = UserCertification::getInstance()->where('uid', $uid)->find();
-            if (!$certification) {
-                Log::info('用户ID' . $uid . '未实名认证');
-                continue;
-            }
+            // $certification = UserCertification::getInstance()->where('uid', $uid)->find();
+            // if (!$certification) {
+            //     Log::info('用户ID' . $uid . '未实名认证');
+            //     continue;
+            // }
             $pension = $ProductRepository->yanglaojin(0, sprintf('%.2f', $thrid['commission']));
-            Db::transaction(function () use ($uid, $certification, $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
-                //新增入账明细记录
-                $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
-                $create    = [
-                    'uid'          => $uid,
-                    'platform_no'  => $orderId,
-                    'user_name'    => $certification['user_name'],
-                    'mobile'       => $certification['mobile'],
-                    'user_card'    => $certification['user_card'],
-                    'pension'      => $pension,
-                    'order_type'   => 8,
-                    'out_trade_no' => $thrid['order_sn']
-                ];
-                $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
-                if ($test_user == 0) {
-                    $OrderGzcRepository->create($create);
-                }
+            Db::transaction(function () use ($uid, $thrid, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
+                // //新增入账明细记录
+                // $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
+                // $create    = [
+                //     'uid'          => $uid,
+                //     'platform_no'  => $orderId,
+                //     'user_name'    => $certification['user_name'],
+                //     'mobile'       => $certification['mobile'],
+                //     'user_card'    => $certification['user_card'],
+                //     'pension'      => $pension,
+                //     'order_type'   => 8,
+                //     'out_trade_no' => $thrid['order_sn']
+                // ];
+                // $test_user = Db::name('user')->where('uid', $uid)->value('test_user');
+                // if ($test_user == 0) {
+                //     $OrderGzcRepository->create($create);
+                // }
                 Db::table('rrx_order_dy')
                     ->update(['gzc' => 1, 'order_dy_id' => $thrid['order_dy_id']]);
-
+                Db::name('user_bill')
+                    ->where('order_sn', $thrid['order_sn'])
+                    ->where('commission_type', 5)
+                    ->update(['status'=> 1]);
                 // 养老金区域奖励
                 $order_data = [
                     'pay_price'        => $pension,

app/common/repositories/movie/MovieRepository.php

@@ -123,22 +123,18 @@ class MovieRepository extends BaseRepository
     {
         $result = DouHuoMallFilmApiRequest::getSchedSeat($relation_id, $sched_sign);
 
-        $schedSeatList = (isset($result['code']) && ($result['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE))
-            ? $result['data']['list'] : [];
+        $schedSeatList = (isset($result['code']) && ($result['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) ? $result['data'] : [];
         foreach ($schedSeatList as $key => $value) {
-            $tmpprice = json_decode($value['price'], true);
-            if (isset($tmpprice['P2'])) {
-                $price = $tmpprice['P2'];
-            } elseif (isset($tmpprice['P1'])) {
-                $price = $tmpprice['P1'];
-            } elseif (isset($tmpprice['P0'])) {
-                $price = $tmpprice['P0'];
-            } else {
-                $price = 0.00;
+            $tmpprice = [];
+            foreach ($value['price'] as $pKey => $pValue) {
+                $tmpprice[$pValue] = ['channel_type' => $pKey, 'price' => $pValue];
             }
+            ksort($tmpprice);
+            $tmpprice = array_shift($tmpprice);
             unset($schedSeatList[$key]['price']);
 
-            $pcYanglaojinGongxian = self::getPvYanglaojinScore($price);
+            $pcYanglaojinGongxian = self::getPvYanglaojinScore($tmpprice['price']);
+            $schedSeatList[$key]['channel_type'] = $tmpprice['channel_type'];
             $schedSeatList[$key]['price'] = $pcYanglaojinGongxian['cost_price'];
             $schedSeatList[$key]['yanglaojin'] = $pcYanglaojinGongxian['yanglaojin'];
             $schedSeatList[$key]['pv'] = $pcYanglaojinGongxian['pv'];

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

@@ -381,6 +381,12 @@ class ProductRepository extends BaseRepository
         $pric = $stock = $ot_price = $cost = $dc_price = $concession_pri = 0;
         if (isset($data['attrValue']) && is_array($data['attrValue'])) {
             foreach ($data['attrValue'] as $value) {
+
+                $value['cost'] = bcsub($value['price'], bcmul($value['price'], $value['extension_one'] / 100, 2), 2);
+                $value['gong_mer_profit'] = bcmul($value['price'], $value['extension_one'] / 100, 2);
+                $value['gong_market_price'] = bcadd($value['cost'], $value['gong_mer_profit'], 2);
+                $value['plate_mer_profit'] = $value['gong_mer_profit'];
+
                 $sku = '';
                 if (isset($value['detail']) && is_array($value['detail'])) {
                     $sku = implode(',', $value['detail']);
@@ -1019,7 +1025,7 @@ class ProductRepository extends BaseRepository
                 $s = 8000;
             }
 
-            $res['yanglao'] = round($s * 0.035,2);
+            $res['yanglao'] = bcmul($s, 0.035, 2);  
         }
 
 
@@ -1695,8 +1701,8 @@ class ProductRepository extends BaseRepository
 
             if($product['mer_id'] == 496){
 
-                $yanglao = round($num_yl * 0.035, 2);
-                $pv=$num_yl *0.7;
+                $yanglao = bcmul($num_yl, 0.035, 2);
+                $pv = bcmul($num_yl, 0.7, 2);
                 //$v['vr']=$v['price'];
                 //1:为会员专区,
 
@@ -1709,24 +1715,24 @@ class ProductRepository extends BaseRepository
 
             }else if($product['mer_id'] == 439){
                 //精彩生活和商贸区
-                $jf = $product['price'] - round($product['concession_pri']*0.3, 2) . ' + ' . round($product['concession_pri']*0.3, 2);
-                $jd = $product['price'] - round($product['concession_pri']*0.35, 2) . ' + ' . round($product['concession_pri']*0.35, 2);
+                $jf = $product['price'] - bcmul($product['concession_pri'], 0.3, 2) . ' + ' . bcmul($product['concession_pri'],0.3, 2);
+                $jd = $product['price'] - bcmul($product['concession_pri'], 0.35, 2) . ' + ' . bcmul($product['concession_pri'],0.35, 2);
                 if($product['concession_pri'] !=null || $product['concession_pri'] !=0){
-                    $yanglao = round($product['concession_pri'] * 0.3, 2);
-                    $pv = round($product['concession_pri'] * 0.35, 2);
+                    $yanglao = bcmul($product['concession_pri'], 0.3, 2);
+                    $pv = bcmul($product['concession_pri'], 0.35, 2);
                     $srtArry['jfduihuan'] =$jf;
                     $srtArry['jdduihuan'] = $jd;
-                    $jifen = round($product['concession_pri'] * 0.35, 2);
-                    $gongxian = round($product['concession_pri'] * 0.35, 2);
+                    $jifen = bcmul($product['concession_pri'], 0.35, 2);
+                    $gongxian = bcmul($product['concession_pri'], 0.35, 2);
 
-                    $jcvr = $product['price'] - round($product['concession_pri']*0.3, 2);
-                    $jcjf = round($product['concession_pri']*0.3, 2);
-                    $jcprice = $product['price'] - round($product['concession_pri']*0.3, 2);
-                    $jcjf1 = round($product['concession_pri']*0.3, 2);
-                    $jcvr1 = $product['price'] - round($product['concession_pri']*0.35, 2);
-                    $jcjd = round($product['concession_pri']*0.35, 2);
-                    $jcprice1 = $product['price'] - round($product['concession_pri']*0.35, 2);
-                    $jcjd1 = round($product['concession_pri']*0.35, 2);
+                    $jcvr = $product['price'] - bcmul($product['concession_pri'], 0.3, 2);
+                    $jcjf = bcmul($product['concession_pri'], 0.3, 2);
+                    $jcprice = $product['price'] - bcmul($product['concession_pri'], 0.3, 2);
+                    $jcjf1 = bcmul($product['concession_pri'], 0.3, 2);
+                    $jcvr1 = $product['price'] - bcmul($product['concession_pri'], 0.35, 2);
+                    $jcjd = bcmul($product['concession_pri'], 0.35, 2);
+                    $jcprice1 = $product['price'] - bcmul($product['concession_pri'], 0.35, 2);
+                    $jcjd1 = bcmul($product['concession_pri'], 0.35, 2);
 
 
                     //支付组合
@@ -1758,7 +1764,7 @@ class ProductRepository extends BaseRepository
                 // 获取商品sku
                 $productSku = Db::name('store_product_attr_value')->where('product_id', $good_id)->order('price asc')->find();
                 $pv = $productSku['plate_mer_profit']??0.00;
-                $yanglao = round($pv * 0.5, 2);
+                $yanglao = bcmul($pv, 0.5, 2);
                 //$v['vr']=$v['price'];
                 //1:为会员专区,
 
@@ -1777,24 +1783,24 @@ class ProductRepository extends BaseRepository
                 // 1企业2个体3个人
                 if ($merchantInfo && in_array($merchantInfo['type'],[2,3])) {
                     //商贸区
-                    $jf = $product['price'] - round($product['concession_pri']*0.3, 2) . ' + ' . round($product['concession_pri']*0.3, 2);
-                    $jd = $product['price'] - round($product['concession_pri']*0.35, 2) . ' + ' . round($product['concession_pri']*0.35, 2);
+                    $jf = $product['price'] - bcmul($product['concession_pri'],0.3, 2) . ' + ' . bcmul($product['concession_pri'],0.3, 2);
+                    $jd = $product['price'] - bcmul($product['concession_pri'],0.35, 2) . ' + ' . bcmul($product['concession_pri'],0.35, 2);
                     if($product['concession_pri'] !=null || $product['concession_pri'] !=0){
-                        $yanglao = round($product['concession_pri'] * 0.3, 2);
-                        $pv = round($product['concession_pri'] * 0.35, 2);
+                        $yanglao = bcmul($product['concession_pri'], 0.3, 2);
+                        $pv = bcmul($product['concession_pri'], 0.35, 2);
                         $srtArry['jfduihuan'] =$jf;
                         $srtArry['jdduihuan'] = $jd;
-                        $jifen = round($product['concession_pri'] * 0.35, 2);
-                        $gongxian = round($product['concession_pri'] * 0.35, 2);
-
-                        $jcvr = $product['price'] - round($product['concession_pri']*0.3, 2);
-                        $jcjf = round($product['concession_pri']*0.3, 2);
-                        $jcprice = $product['price'] - round($product['concession_pri']*0.3, 2);
-                        $jcjf1 = round($product['concession_pri']*0.3, 2);
-                        $jcvr1 = $product['price'] - round($product['concession_pri']*0.35, 2);
-                        $jcjd = round($product['concession_pri']*0.35, 2);
-                        $jcprice1 = $product['price'] - round($product['concession_pri']*0.35, 2);
-                        $jcjd1 = round($product['concession_pri']*0.35, 2);
+                        $jifen = bcmul($product['concession_pri'], 0.35, 2);
+                        $gongxian = bcmul($product['concession_pri'], 0.35, 2);
+
+                        $jcvr = $product['price'] - bcmul($product['concession_pri'], 0.3, 2);
+                        $jcjf = bcmul($product['concession_pri'], 0.3, 2);
+                        $jcprice = $product['price'] - bcmul($product['concession_pri'], 0.3, 2);
+                        $jcjf1 = bcmul($product['concession_pri'], 0.3, 2);
+                        $jcvr1 = $product['price'] - bcmul($product['concession_pri'], 0.35, 2);
+                        $jcjd = bcmul($product['concession_pri'], 0.35, 2);
+                        $jcprice1 = $product['price'] - bcmul($product['concession_pri'], 0.35, 2);
+                        $jcjd1 = bcmul($product['concession_pri'], 0.35, 2);
 
                         $fzone_paytype= [
 //                ['type'=>'b1','price'=>$jcvr,'other'=>$jcjf],

app/common/repositories/system/merchant/MerchantRepository.php

@@ -455,8 +455,8 @@ class MerchantRepository extends BaseRepository
 
             if($merId == 496){
 
-                $v['yanglao'] = round($num_yl * 0.035, 2);
-                $v['pv']=$num_yl *0.7;
+                $v['yanglao'] = bcmul($num_yl, 0.035, 2);
+                $v['pv'] = bcmul($num_yl, 0.7, 2);
                 //$v['vr']=$v['price'];
                 //1:为会员专区,
 
@@ -469,15 +469,15 @@ class MerchantRepository extends BaseRepository
 
             }else if($merId == 439 || $is_commercetrade){
                 //精彩生活和商贸区
-                $jf = $v['price'] - round($v['concession_pri']*0.3, 2) . ' + ' . round($v['concession_pri']*0.3, 2);
-                $jd = $v['price'] - round($v['concession_pri']*0.35, 2) . ' + ' . round($v['concession_pri']*0.35, 2);
+                $jf = $v['price'] - bcmul($v['concession_pri'],0.3, 2) . ' + ' . bcmul($v['concession_pri'],0.3, 2);
+                $jd = $v['price'] - bcmul($v['concession_pri'],0.35, 2) . ' + ' . bcmul($v['concession_pri'],0.35, 2);
                 if($v['concession_pri'] !=null || $v['concession_pri'] !=0){
-                    $v['yanglao'] = round($v['concession_pri'] * 0.3, 2);
-                    $v['pv'] = round($v['concession_pri'] * 0.35, 2);
+                    $v['yanglao'] = bcmul($v['concession_pri'],0.3, 2);
+                    $v['pv'] = bcmul($v['concession_pri'],0.35, 2);
                     $v['jfduihuan'] =$jf;
                     $v['jdduihuan'] = $jd;
-                    $v['jifen'] = round($v['concession_pri'] * 0.35, 2);
-                    $v['gongxian'] = round($v['concession_pri'] * 0.35, 2);
+                    $v['jifen'] = bcmul($v['concession_pri'], 0.35, 2);
+                    $v['gongxian'] = bcmul($v['concession_pri'], 0.35, 2);
                 }
             }else if($merId == 491){
                 // 获取商品sku
@@ -486,7 +486,7 @@ class MerchantRepository extends BaseRepository
 
 //                $num_yl = $v['price'];
 //                $pv= $num_yl * 0.3;
-                $yanglao = round($pv * 0.5, 2);
+                $yanglao = bcmul($pv, 0.5, 2);
                 $v['pv'] = $pv;
                 $v['yanglao'] = $yanglao;
 

app/controller/api/movie/Movie.php

@@ -189,7 +189,7 @@ class Movie extends BaseController
         );
 
         if (empty($params['relation_id']) || empty($params['sched_sign'])) return app('json')->fail('请选择观影场次');
-        if (empty($params['seat_no']) || empty($params['seat_sign'])) return app('json')->fail('请选择座位');
+        if (empty($params['seat_no']) || empty($params['seat_sign'])) return app('json')->fail('请选择观影座位');
 
         $result = $this->repository->submitOrder($this->request->userInfo(), $params);
         if (!empty($result)) {

app/controller/api/user/User.php

@@ -231,6 +231,75 @@ class User extends BaseController
         log::info("=======date==={$data}");
         return app("json")->success($data);
     }
+
+
+    public function buildTreeContribute($users, $parentId = 0) {
+        $branch = array();
+        foreach ($users as $user) {
+            if ($user['spread_uid'] == $parentId) {
+                $children = $this->buildTreeContribute($users, $user['uid']); // 递归查找子节点
+                if ($children) {
+                    $user['children'] = $children; // 如果有子节点，添加到当前节点
+                }
+                $user['total_contribute'] = $user['contribute_sum']; // 初始化当前节点的总余额为自身余额
+                if ($children) { // 如果存在子节点，计算总余额
+                    foreach ($children as $child) {
+                        $user['total_contribute'] += $child['total_contribute']; // 累加子节点的总余额
+                    }
+                }
+                $branch[] = $user; // 将当前节点添加到树中
+            }
+        }
+        return $branch; // 返回当前分支的所有节点
+    }
+
+    // 根据父级uid,递归获取所有子级UID数组 默认深度10级
+    public function getRecursiveChildrenChengji($parentUid, $number = 10) {
+        $user = Db::name('user')->where('uid', $parentUid)->field('uid,spread_uid,contribute,per_contribute')->find();
+        $user['contribute_sum'] = bcadd($user['contribute'], $user['per_contribute'], 2);
+        $uids = [];// 用于存储符合条件的子级 uid
+        $result = [$user]; // 用于存储符合条件的子级数据
+
+        // 定义递归函数
+        $num = 0;//当前层级
+        $recursion = function ($parentUid, $number, $num) use (&$uids, &$result, &$recursion) {
+            if($num >= $number){ 
+                return;
+            }
+
+            // 查询当前父级的所有直接子级
+            $children = Db::name('user')->field('uid,spread_uid,contribute,per_contribute')->where("spread_uid", $parentUid)->select()->toArray();
+            // 如果没有子级，直接返回
+            if (!count($children) && count($children) < 1) {
+                return;
+            }else{
+                $num = $num + 1;
+            }
+
+            // 遍历每个子级
+            foreach ($children as $childUid) {
+                //如果有重复的就跳过 防止死循环
+                if(in_array($childUid['uid'], $uids)){
+                    continue;
+                }
+                // 将符合条件的子级 uid 添加到结果数组
+                $uids[] = $childUid['uid'];
+
+                // 将符合条件的子级 uid 添加到结果数组
+                $childUid['contribute_sum'] = bcadd($childUid['contribute'], $childUid['per_contribute'], 2);
+                $result[] = $childUid;
+
+                // 递归查询子级的子级
+                $recursion($childUid['uid'], $number, $num);
+            }
+        };
+
+        // 从初始父级开始递归查询
+        $recursion($parentUid, $number, $num);
+
+        return $result; // 返回结果数组，并去重
+    }
+
     //贡献值
 
     public function  gongxian_info(){
@@ -245,33 +314,52 @@ class User extends BaseController
             //     $totalcon += $v['number'];
             // }
             //已经入账贡献值
-            if( $con['user_group'] <= 2 ){
-                $data['total_source'] =  $con['contribute'] + $con['per_contribute'];
-            }else{
-                $data['total_source'] =  $con['contribute'];
-            }
+            // if( $con['user_group'] <= 2 ){
+            //     $data['total_source'] =  $con['contribute'] + $con['per_contribute'];
+            // }else{
+            $data['total_source'] =  $con['contribute'];
+            // }
            
             
            // $getteamscon = $this->getPerformance($user->uid);
 
             //$getcon = $this->getPerformance_getcon( $user->uid);
 
-            $team_userinfo_old_jbp22 = $this->getPerformance22($user->uid);
+            // $team_userinfo_old_jbp22 = $this->getPerformance22($user->uid);
 
-            //我的团队贡献值
-            if( $con['user_group'] <= 2 ){
-                $data['team_gongxian_num'] =  $team_userinfo_old_jbp22['person_nums_pv'] - $con['per_contribute'];
+            $user_id = $con['uid'];
+            $user_group = $con['user_group'];
+            $number = 10;
+            if($user_group <= 1){
+                $number = 1;
+            }
+            //如果下级团队只有一个人 那就不用再查了 为0
+            //如果用户等级为用户身份 只查一级直推
+            //去除掉贡献值最大的下级
+            $child_nums = $this->getRecursiveChildrenChengji($user_id, $number);
+            $child_nums_Tree = $this->buildTreeContribute($child_nums);
+            if (empty($child_nums_Tree)){
+                $child_nums_Tree = $child_nums;
+                $total_contribute = $child_nums_Tree[0]['per_contribute'];
             }else{
-                $data['team_gongxian_num'] = $team_userinfo_old_jbp22['person_nums_pv'];
+                // 找到贡献值最大的用户的索引
+                $maxBalanceIndex = array_search(max(array_column($child_nums_Tree[0]['children'], 'total_contribute')), array_column($child_nums_Tree, 'total_contribute'));
+                // 减去该用户的贡献值
+                $total_contribute = bcsub($child_nums_Tree[0]['total_contribute'], $child_nums_Tree[0]['children'][$maxBalanceIndex]['total_contribute'], 2);
             }
+            $data['team_gongxian_num'] = $total_contribute;
 
-           
+            //我的团队贡献值
+            // if( $con['user_group'] <= 2 ){
+            //     $data['team_gongxian_num'] = $team_userinfo_old_jbp22['person_nums_pv'] - $con['per_contribute'];
+            // }else{
+            //     $data['team_gongxian_num'] = $team_userinfo_old_jbp22['person_nums_pv'];
+            // }
 
-            //为生贡献值
+            //未生效贡献值
             $data['no_total_source']=Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user->uid)->sum('number');
             log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
             return app('json')->success($data);
-
         }
 
     }

crmeb/listens/GongListen.php

@@ -21,10 +21,10 @@ class GongListen implements ListenerInterface
         $storeOrderRepository = app()->make(StoreOrderRepository::class);
         Timer::tick(60000, function () use ($storeOrderRepository) {
             //每天下午3点执行一次
-            if (date('i') == '00') {
+            // if (date('i') == '00') {
                 $storeOrderRepository->douhuomall_delivery();
-                $this->mer_365_up();
-            }
+                // $this->mer_365_up();
+            // }
             //每天晚上1点
             if (date('H:i') == '01:00') {
 //                $storeOrderRepository->yihuchashengji();
@@ -34,7 +34,7 @@ class GongListen implements ListenerInterface
 //                $storeOrderRepository->yihuchafenxiang();
             }
             if (date('H:i') == '23:00') {
-                $this->take();
+                // $this->take();
             }
         });
     }