Merge branch 'sxb-dev-01' into sxb-dev

app/command/CinemaSchedCommand.php

@@ -3,6 +3,7 @@
 namespace app\command;
 
 use app\common\repositories\movie\CinemaRepository;
+use app\common\repositories\movie\CinemaSchedRepository;
 use app\common\repositories\movie\FilmRepository;
 use app\common\repositories\movie\MovieRepository;
 use crmeb\services\ApiResponseService;
@@ -19,7 +20,7 @@ class CinemaSchedCommand extends Command
     protected function configure()
     {
         // 指令配置
-        $this->setName('cinema_sched')->setDescription('电影-影院场次列表');
+        $this->setName('cinema_film_sched')->setDescription('电影-影院场次列表');
     }
 
     protected function execute(Input $input, Output $output)
@@ -36,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) {
@@ -56,9 +59,7 @@ class CinemaSchedCommand extends Command
         $cinema_filmRepository = app()->make(MovieRepository::class);
         $cinema_sched = $cinema_filmRepository->getCinemaSched($film['film_sign'], $cinema['cinema_sign']);
 
-        if (isset($cinema_sched['code']) && ($cinema_sched['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) {
-            $this->createCinemaSched($cinema_sched['data']['list'], $cinema);
-        }
+        $this->createCinemaSched($cinema_sched, $cinema);
     }
 
     /**
@@ -71,35 +72,38 @@ class CinemaSchedCommand extends Command
      */
     private function createCinemaSched($list, $cinema)
     {
-        foreach ($list as $key => $value) {
-            $params = [
-                'relation_id' => $value['relation_id'],
-                'sched_sign' => $value['sched_sign'],
-                'film_sign' => $value['film_sign'],
-                'film_name' => $value['film_name'],
-                'show_date' => strtotime(date('Y') . '-' . $value['show_date']),
-                'show_time' => trim($value['show_time']),
-                'cinema_sign' => $cinema['cinema_sign'],
-                'cinema_name' => $cinema['cinema_name'],
-                'address' => $cinema['address'],
-                'longitude' => $cinema['longitude'],
-                'latitude' => $cinema['latitude'],
-                'hall_sign' => $value['hall_sign'],
-                'hall_name' => $value['hall_name'],
-                'stop_sell_time' => $value['stop_sell_time'],
-                'cost_price' => $value['cost_price'],
-                'channel_price' => json_encode($value['channel_price'], JSON_FORCE_OBJECT)
-            ];
-            $where = [
-                'relation_id' => $value['relation_id'], 'sched_sign' => $value['sched_sign'], 'film_sign' => $value['film_sign'], 'cinema_sign' => $params['cinema_sign']
-            ];
-            $model = Db::name('movie_cinema_sched')->where($where)->find();
-            if (empty($model)) {
-                $params['create_time'] = time();
-                Db::name('movie_cinema_sched')->insert($params);
-            } else {
-                $params['update_time'] = time();
-                Db::name('movie_cinema_sched')->where('id', $model['id'])->update($params);
+        foreach ($list as $key => $sched) {
+            foreach ($sched as $subKey => $value) {
+                $params = [
+                    'relation_id' => $value['relation_id'],
+                    'sched_sign' => $value['sched_sign'],
+                    'film_sign' => $value['film_sign'],
+                    'film_name' => $value['film_name'],
+                    'show_date' => strtotime(date('Y') . '-' . $value['show_date']),
+                    'show_time' => trim($value['show_time']),
+                    'cinema_sign' => $cinema['cinema_sign'],
+                    'cinema_name' => $cinema['cinema_name'],
+                    'address' => $cinema['address'],
+                    'longitude' => $cinema['longitude'],
+                    'latitude' => $cinema['latitude'],
+                    'hall_sign' => $value['hall_sign'],
+                    'hall_name' => $value['hall_name'],
+                    'stop_sell_time' => strtotime($value['stop_sell_time']),
+                    'price' => $value['price'], // 原价
+                    'cost_price' => $value['cost_price'], // 销售价
+                    'channel_price' => json_encode($value['channel_price'], JSON_FORCE_OBJECT)
+                ];
+                $where = [
+                    'relation_id' => $value['relation_id'], 'sched_sign' => $value['sched_sign'], 'film_sign' => $value['film_sign'], 'cinema_sign' => $params['cinema_sign']
+                ];
+                $model = Db::name('movie_cinema_sched')->where($where)->find();
+                if (empty($model)) {
+                    $params['create_time'] = time();
+                    Db::name('movie_cinema_sched')->insert($params);
+                } else {
+                    $params['update_time'] = time();
+                    Db::name('movie_cinema_sched')->where('id', $model['id'])->update($params);
+                }
             }
         }
     }

app/command/HuafeiOrderIndependentAccount.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace app\command;
+
+use app\common\model\store\order\StoreOrder;
+use app\common\model\user\UserCertification;
+use app\common\repositories\merchant\order\OrderGzcRepository;
+use app\common\repositories\merchant\order\OrderMerchantRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\common\repositories\store\order\StoreOrderStatusRepository;
+use app\common\repositories\user\UserBillRepository;
+use app\common\repositories\user\UserRepository;
+use Carbon\Carbon;
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\facade\Db;
+use think\facade\Log;
+
+class HuafeiOrderIndependentAccount extends Command
+{
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('huafei-order-independent-account')
+            ->setDescription('话费订单分账');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        // @todo 精彩生活区订单分账
+        $this->doHuafeiOrderIndependentAccount();
+    }
+
+    /**
+     * 会员专区、精彩生活区订单分账
+     *
+     * @param $merId
+     * @param $timeLimit
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    private function doHuafeiOrderIndependentAccount($timeLimit = 1)
+    {
+        $dst_mer_id = systemConfig('mer_365');
+
+        // 商户信息
+        $merchants = [];
+
+        $time = time();
+        // 订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付 6已取消'
+        $status = [2];
+        // 普通订单
+        $cursor = Db::table('rrx_order_huafei')->where('is_independentaccount', 0)->whereIn('status', $status)->cursor();
+
+        /** @var StoreOrderRepository $storeOrderRepository */
+        $storeOrderRepository = app()->make(StoreOrderRepository::class);
+
+        foreach ($cursor as $key => $value) {
+            $settlement_period_time = strtotime($value['create_time']) + $timeLimit * 24 * 3600;
+            // @todo 下单后第{$timeLimit}天后可分账
+            if ($settlement_period_time >= $time) {
+                $merchants['496'] = Db::name('merchant')->where('mer_id', 496)->find();
+                $order_huafei_hf = Db::name('order_huafei_hf')->where('order_no', $value['order_sn'])->find();
+                if(!$order_huafei_hf) continue;
+                $value['mer_id'] = 496;
+                $order_huafei_hf['mer_id'] = 496;
+
+                // 分账账号 496：表示{会员专区}账户，分账到{会员专区}账户
+                $independentAccount = $storeOrderRepository->getIndependentAccountHuafei($order_huafei_hf, $dst_mer_id, $merchants['496']['hf_member_id']);
+
+                // @todo 预分账处理 分账到{会员专区}账户，故：hf_platform_member_id 为入账账户
+                $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccountHuafei(
+                    $value, $order_huafei_hf, $independentAccount['api_key'], $independentAccount['hf_platform_member_id'], '', $value['pay_price'], 0
+                );
+
+                if ($isSuccessed) {
+                    Db::name("log")->insert(array('data' => '话费-订单分账：' . json_encode($value, JSON_FORCE_OBJECT)));//日志记录
+                    Db::table('rrx_order_huafei')->where('order_sn', $value['order_sn'])->update(['is_independentaccount' => 1]);
+                }
+            }
+        }
+    }
+
+}

app/command/PensionTasks.php

@@ -12,6 +12,7 @@ use app\common\repositories\merchant\order\OrderMerchantRepository;
 use app\common\repositories\store\order\StoreOrderStatusRepository;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\user\UserBillRepository;
+use app\common\repositories\user\UserRepository;
 use app\traits\GzcApiRequest;
 use Carbon\Carbon;
 use think\console\Command;
@@ -58,6 +59,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 +70,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 +213,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);
 
 
@@ -424,6 +525,9 @@ class PensionTasks extends Command
                             'status'          => 1,
                             'settlement_time' => date('Y-m-d H:i:s')
                         ]);
+                    /** @var UserRepository $userRepository */
+                    $userRepository = app()->make(UserRepository::class);
+                    $userRepository->setUserIdentity($user_sign_gongxian['uid']);
                 }
 
             });
@@ -469,48 +573,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);
-            }
+            // $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 +632,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);
@@ -667,6 +776,9 @@ class PensionTasks extends Command
                             'status'          => 1,
                             'settlement_time' => date('Y-m-d H:i:s')
                         ]);
+                    /** @var UserRepository $userRepository */
+                    $userRepository = app()->make(UserRepository::class);
+                    $userRepository->setUserIdentity($user_sign_gongxian['uid']);
                 }
 
                 
@@ -743,33 +855,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 +922,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 +987,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 +1053,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 +1110,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 +1175,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 +1240,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/dao/user/UserIdentityDao.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-05-07
+ *
+ * 
+ */
+
+namespace app\common\dao\user;
+
+
+use app\common\dao\BaseDao;
+use app\common\model\BaseModel;
+use app\common\model\user\UserIdentity;
+use think\db\BaseQuery;
+
+/**
+ * Class UserIdentityDao
+ * @package app\common\dao\user
+ */
+class UserIdentityDao extends BaseDao
+{
+
+    /**
+     * @return BaseModel
+     * @author xaboy
+     * @day 2020-03-30
+     */
+    protected function getModel(): string
+    {
+        return UserIdentity::class;
+    }
+
+
+    /**
+     * @param array $where
+     * @return BaseQuery
+     * @author xaboy
+     * @day 2020-05-06
+     */
+    public function search(array $where = [])
+    {
+        return UserIdentity::getDB();
+    }
+
+}

app/common/model/movie/cinema/Cinema.php

@@ -24,8 +24,8 @@ class Cinema extends BaseModel
 
         return $model->when(isset($where['cinema_name']) && $where['cinema_name'], function ($query) use ($where) {
             $query->where('cinema_name', 'like', "%{$where['cinema_name']}%");
-        })->when(isset($where['cate_one_id']) && $where['cate_one_id'], function ($query) use ($where) {
-            $query->where('cate_one_id', $where['cate_one_id']);
+        })->when(isset($where['cinema_sign']) && $where['cinema_sign'], function ($query) use ($where) {
+            $query->where('cinema_sign', $where['cinema_sign']);
         })->when(isset($where['cate_two_id']) && $where['cate_two_id'], function ($query) use ($where) {
             $query->where('cate_two_id', $where['cate_two_id']);
         })->when(isset($where['city']) && $where['city'], function ($query) use ($where) {

app/common/model/movie/cinema/CinemaSched.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace app\common\model\movie\cinema;
+
+use app\model\BaseModel;
+
+class CinemaSched extends BaseModel
+{
+    protected $name = 'movie_cinema_sched';
+
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    /**
+     * @param $model
+     * @param array $where
+     * @return CinemaSched
+     */
+    public function search($model = null, array $where = [])
+    {
+        $model = $model ?? new self();
+
+        return $model->when(isset($where['film_sign']) && $where['film_sign'], function ($query) use ($where) {
+            $query->where('film_sign', $where['film_sign']);
+        })->when(isset($where['cinema_sign']) && $where['cinema_sign'], function ($query) use ($where) {
+            $query->where('cinema_sign', $where['cinema_sign']);
+        })->when(isset($where['show_date']) && $where['show_date'], function ($query) use ($where) {
+            $query->where('show_date', $where['show_date']);
+        })->when(isset($where['relation_id']) && $where['relation_id'], function ($query) use ($where) {
+            $query->where('relation_id', $where['relation_id']);
+        })->when(isset($where['sched_sign']) && $where['sched_sign'], function ($query) use ($where) {
+            $query->where('sched_sign', $where['sched_sign']);
+        });
+    }
+}

app/common/model/user/UserIdentity.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-05-07
+ *
+ * 
+ */
+
+namespace app\common\model\user;
+
+
+use app\common\model\BaseModel;
+
+class UserIdentity extends BaseModel
+{
+
+    /**
+     * @return string
+     * @author xaboy
+     * @day 2020-03-30
+     */
+    public static function tablePk(): string
+    {
+        return 'user_group_id';
+    }
+
+    /**
+     * @return string
+     * @author xaboy
+     * @day 2020-03-30
+     */
+    public static function tableName(): string
+    {
+        return 'user_identity';
+    }
+}

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -359,7 +359,7 @@ class OrderMerchantRepository extends BaseRepository
                 }
             }
             if ($paramOrder['avatar'] == null) {
-                $paramOrder['avatar'] = 'http://app.bjtdba.com/uploads/def/20201118/5984361a2e00f5407776bcd6eaaae1ce.png';
+                $paramOrder['avatar'] = 'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png';
             }
             $order = Db::transaction(function () use ($paramOrder) {
                 $merchantOrder = $this->dao->create($paramOrder);
@@ -425,7 +425,7 @@ class OrderMerchantRepository extends BaseRepository
         }
 //        Db::name('log')->insert(['data' => json_encode($paramOrder)]);
         if ($paramOrder['avatar'] == null) {
-            $paramOrder['avatar'] = 'http://app.bjtdba.com/uploads/def/20201118/5984361a2e00f5407776bcd6eaaae1ce.png';
+            $paramOrder['avatar'] = 'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png';
         }
         $order = Db::transaction(function () use ($paramOrder) {
             $merchantOrder = $this->dao->create($paramOrder);
@@ -902,7 +902,7 @@ class OrderMerchantRepository extends BaseRepository
                     $unionData = [
                         'unionid' => $order->pay_user_id,
                         'nickname' => $order->nickname ?: time(),
-                        'avatar' => $order->avatar ?: 'http://app.bjtdba.com/uploads/def/20201118/5984361a2e00f5407776bcd6eaaae1ce.png',
+                        'avatar' => $order->avatar ?: 'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png',
                         'is_lock' => 1,
                         'lock_mer_id' => $order->mer_id,
                         'lock_time' => date('Y-m-d H:i:s'),
@@ -917,7 +917,7 @@ class OrderMerchantRepository extends BaseRepository
                     } else {
                         $updateData = [
                             'nickname' => $order->nickname ?: time(),
-                            'avatar' => $order->avatar ?: 'http://app.bjtdba.com/uploads/def/20201118/5984361a2e00f5407776bcd6eaaae1ce.png',
+                            'avatar' => $order->avatar ?: 'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png',
                             'balance' => Db::raw('balance+' . $order->money),
                             'give_money' => Db::raw('give_money+' . $order->give_money),
                             'pension' => Db::raw('pension+' . $order->pension),
@@ -1583,6 +1583,8 @@ class OrderMerchantRepository extends BaseRepository
         //可分总佣金
         $divisible_commission = bcmul($order['pay_price'], bcdiv($mer_fanyongbili, '100', 2), 2);//让利部分
         $pv = bcmul($divisible_commission, '0.7', 2);//商家让利部分30%给消费者做养老金，70%做业绩PV
+        //更新值
+        Db::name("order_merchant")->where('id', $order_id)->where('out_trade_no', $order_sn)->update(['available'=>$divisible_commission]);
 
         /**
          * 各自的比例开始
@@ -1598,6 +1600,34 @@ class OrderMerchantRepository extends BaseRepository
          * 各自的比例结束
          */
 
+        $gongxian = Db::name('user_sign_gongxian')->where('order_id', $order_id)->find();
+        if(!$gongxian){
+            ///用户可以拿到PV等值贡献值
+            if ($pv >= 0.01) {
+                //贡献值
+                $gongxian_data = [
+                    "uid"           =>$order["uid"]??0,
+                    "number"  =>    $pv,
+                    "addtime"       =>time(),
+                    "status"        =>1,
+                    "order_type"    =>1,
+                    "order_id"      =>$order_id,
+                    "mark"          =>"扫码消费获得赠送贡献值",
+                    "desc"          =>'',
+                    "surplus"       =>$pv,
+                    "type"          =>1,
+                    'settlement_time' => date('Y-m-d H:i:s')
+                ];
+                Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
+            } else {
+                Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，积分和贡献值低于0.01无法入库 特此记录！']);
+            }
+        }
+
+
+
+
+
         // 商户---------------------------------------------------------------------------------------------------------------
 
         $mer_data = Db::name('merchant')->where('mer_id', $order['mer_id'])->field('uid,mer_id')->find();
@@ -1605,28 +1635,28 @@ class OrderMerchantRepository extends BaseRepository
         $merchant_user = $userRepository->getOne(['uid' => $mer_data["uid"]]);
 
         //商户得到的(京豆和贡献值奖励的倍，后台设置)
-        $gongxian = bcmul($divisible_commission, $mer_gonxian, 2);
-        if ($gongxian >= 0.01) {
-            $gongxian_data = [
-                "uid"           =>$mer_data["uid"],
-                "mer_id"        =>$order["mer_id"],
-                "pv"            =>$pv,
-                "number"  =>    $gongxian,
-                "addtime"       =>time(),
-                "status"        =>1,
-                "order_type"    =>2,
-                "order_id"      =>$order_id,
-                "mark"          =>"用户消费商家获得赠送贡献值",
-                "desc"          =>'',
-                "surplus"       =>$gongxian,
-                "type"          =>1
-            ];
-            Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
-            $merchant_user->contribute = bcadd($merchant_user->contribute, (float)$gongxian,2);
-            $merchant_user->save();
-        } else {
-            Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
-        }
+        // $gongxian = bcmul($divisible_commission, $mer_gonxian, 2);
+        // if ($gongxian >= 0.01) {
+            // $gongxian_data = [
+            //     "uid"           =>$mer_data["uid"],
+            //     "mer_id"        =>$order["mer_id"],
+            //     "pv"            =>$pv,
+            //     "number"  =>    $gongxian,
+            //     "addtime"       =>time(),
+            //     "status"        =>1,
+            //     "order_type"    =>2,
+            //     "order_id"      =>$order_id,
+            //     "mark"          =>"用户消费商家获得赠送贡献值",
+            //     "desc"          =>'',
+            //     "surplus"       =>$gongxian,
+            //     "type"          =>1
+            // ];
+            // Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
+        //     $merchant_user->contribute = bcadd($merchant_user->contribute, (float)$gongxian,2);
+        //     $merchant_user->save();
+        // // } else {
+        //     Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
+        // }
 
         //商户得到的(京豆和贡献值奖励的倍，后台设置)
         $jd = bcmul($divisible_commission, $mer_jd, 2);

app/common/repositories/movie/CinemaRepository.php

@@ -16,7 +16,7 @@ use think\facade\Db;
  * Class CinemaRepository
  * @package app\common\repositories\movie
  * @author xaboy
- * @mixin MovieOrderDao
+ * @mixin Cinema
  */
 class CinemaRepository extends BaseRepository
 {
@@ -85,4 +85,18 @@ class CinemaRepository extends BaseRepository
         return "(round(6378137 * 2 * asin(sqrt(pow(sin(((latitude * pi()) / 180 - ({$latitude} * pi()) / 180) / 2), 2) 
         + cos(({$latitude} * pi()) / 180) * cos((latitude * pi()) / 180) * pow(sin(((longitude * pi()) / 180 - ({$longitude} * pi()) / 180) / 2), 2))))) AS distance";
     }
+
+    /**
+     * 获取影院信息
+     *
+     * @param $cinema_sign
+     * @return Cinema|array|\think\Model|null
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getCinemaInfo($cinema_sign)
+    {
+        return $this->dao->search(null, ['cinema_sign' => $cinema_sign])->find();
+    }
 }

app/common/repositories/movie/CinemaSchedRepository.php

@@ -0,0 +1,162 @@
+<?php
+/**
+ * @package merchant
+ * @Author: Qinii
+ * @Date: 2020/5/8
+ */
+
+namespace app\common\repositories\movie;
+
+use app\common\model\movie\cinema\CinemaSched;
+use app\common\repositories\BaseRepository;
+use think\facade\Db;
+
+/**
+ * Class CinemaSchedRepository
+ * @package app\common\repositories\movie
+ * @author xaboy
+ * @mixin CinemaSched
+ */
+class CinemaSchedRepository extends BaseRepository
+{
+    protected $dao;
+
+    /**
+     * ProductRepository constructor.
+     * @param CinemaSched $dao
+     */
+    public function __construct(CinemaSched $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param $film_sign
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getFilmSchedDate($film_sign)
+    {
+        $field = 'show_date';
+        $where = ['film_sign' => $film_sign];
+
+        $show_date = $this->dao->search(null, $where)->field([$field])->order('show_date asc')->group('show_date')->select()->toArray();
+        foreach ($show_date as $key => $value) {
+            $show_date[$key]['date'] = date('m-d', $value['show_date']);
+        }
+
+        return $show_date;
+    }
+
+    /**
+     * @param $page
+     * @param $limit
+     * @param $longitude
+     * @param $latitude
+     * @param $show_date
+     * @param $with
+     * @param $order
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getFilmSched($page, $limit, $film_sign, $longitude, $latitude, $show_date, $with = [], $order = 1)
+    {
+        $field = 'sched_sign,cinema_sign,cinema_name,address,show_date,price,longitude,latitude';
+        $where = ['film_sign' => $film_sign, 'show_date' => $show_date];
+
+        $cinema_sched = $this->dao->search(null, $where)->when($with, function ($query) use ($with) {
+            $query->with($with);
+        })->when($latitude && $longitude, function ($query) use ($field, $longitude, $latitude) {
+            $query->field([$field, $this->distance($latitude, $longitude)]);
+        })->when($page && $limit, function ($query) use ($page, $limit) {
+            $query->page($page, $limit);
+        })->when(!is_null($order), function ($query) use ($order) {
+            if ($order == 1) {//距离最近
+                $query->order('distance asc');
+            } else {//播放日期
+                $query->order('show_date desc');
+            }
+        })->field([$field])->select()->toArray();
+        foreach ($cinema_sched as $key => $value) {
+            $cinema_sched[$key]['distance'] = isset($value['distance']) ? round($value['distance'] / 1000, 2) : 0.00;
+            $cinema_sched[$key]['show_date'] = date('m-d', $value['show_date']);
+
+            $pcYanglaojinGongxian = MovieRepository::getPvYanglaojinScore($value['price']);
+            $cinema_sched[$key]['price'] = $pcYanglaojinGongxian['cost_price'];
+        }
+
+        $count = $this->dao->search(null, $where)->when($with, function ($query) use ($with) {
+            $query->with($with);
+        })->when($latitude && $longitude, function ($query) use ($field, $longitude, $latitude) {
+            $query->field([$field, $this->distance($latitude, $longitude)]);
+        })->count();
+
+        return compact('cinema_sched', 'count');
+    }
+
+    /**
+     * @param $page
+     * @param $limit
+     * @param $cinema_sign
+     * @param $film_sign
+     * @param $show_date
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getCinemaFilmSched($page, $limit, $cinema_sign, $film_sign, $show_date)
+    {
+        $field = 'relation_id,sched_sign,film_sign,film_name,show_date,show_time,cinema_sign,cinema_name,hall_sign,hall_name,price';
+        $where = ['cinema_sign' => $cinema_sign, 'film_sign' => $film_sign, 'show_date' => strtotime($show_date)];
+
+        $cinema_sched = $this->dao->search(null, $where)
+            ->when($page && $limit, function ($query) use ($page, $limit) {
+                $query->page($page, $limit);
+            })->order('show_time asc')->field([$field])->select()->toArray();
+        foreach ($cinema_sched as $key => $value) {
+            $pcYanglaojinGongxian = MovieRepository::getPvYanglaojinScore($value['price']);
+
+            $cinema_sched[$key]['price'] = $pcYanglaojinGongxian['cost_price'];
+            $cinema_sched[$key]['yanglaojin'] = $pcYanglaojinGongxian['yanglaojin'];
+            $cinema_sched[$key]['pv'] = $pcYanglaojinGongxian['pv'];
+            $cinema_sched[$key]['score'] = $pcYanglaojinGongxian['score'];
+            $cinema_sched[$key]['gongxian'] = $pcYanglaojinGongxian['gongxian'];
+        }
+
+        $count = $this->dao->search(null, $where)->count();
+
+        return compact('cinema_sched', 'count');
+    }
+
+    /**
+     * 经纬度排序计算
+     * @param string $latitude
+     * @param string $longitude
+     * @return string
+     */
+    private function distance(string $latitude, string $longitude)
+    {
+        return "(round(6378137 * 2 * asin(sqrt(pow(sin(((latitude * pi()) / 180 - ({$latitude} * pi()) / 180) / 2), 2) 
+        + cos(({$latitude} * pi()) / 180) * cos((latitude * pi()) / 180) * pow(sin(((longitude * pi()) / 180 - ({$longitude} * pi()) / 180) / 2), 2))))) AS distance";
+    }
+
+    /**
+     * 获取影片场次详情
+     *
+     * @param $relation_id
+     * @param $sched_sign
+     * @return CinemaSched|array|\think\Model|null
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getCinemaSchedInfo($relation_id, $sched_sign)
+    {
+        return $this->dao->search(null, ['relation_id' => $relation_id, 'sched_sign' => $sched_sign])->find();
+    }
+}

app/common/repositories/movie/DouHuoMallFilmApiRequest.php

@@ -203,11 +203,15 @@ class DouHuoMallFilmApiRequest
     /**
      * 锁座订单
      *
-     * @param $relation_id
+     * @param $phone
+     * @param $channel_type
      * @param $sched_sign
+     * @param $seat_sign
+     * @param $third_order
+     * @param $order_price
      * @return mixed|string
      */
-    public static function submitOrder($phone, $channel_type, $sched_sign, $third_order, $order_price)
+    public static function submitOrder($phone, $channel_type, $sched_sign, $seat_sign, $third_order, $order_price)
     {
         $url = '/openapi/Movie/submitOrder';
         $body = [
@@ -216,7 +220,8 @@ class DouHuoMallFilmApiRequest
             'sched_sign' => $sched_sign,
             'third_order' => $third_order,
             'order_price' => $order_price,
-            'phone' => $phone
+            'phone' => $phone,
+            'seat_sign' => $seat_sign
         ];
 
         $res = self::curl_post(self::$path . $url, $body);

app/common/repositories/movie/MovieRepository.php

@@ -28,10 +28,10 @@ class MovieRepository extends BaseRepository
 
     protected $dao;
 
-    private $premium_ratio = 0.2;//溢价比例
-    private $yanglaojin_ratio = 0.3;
+    const premium_ratio = 0.2;//溢价比例
+    const yanglaojin_ratio = 0.3;
 
-    private $pv_ratio = 0.7;
+    const pv_ratio = 0.7;
 
     /**
      * ProductRepository constructor.
@@ -99,15 +99,15 @@ class MovieRepository extends BaseRepository
             ? $result['data']['list'] : [];
         foreach ($cinemaSchedList as $dateDay => &$fileSchedValue) {
             foreach ($fileSchedValue as $key => $value) {
-                $premium = round($value['cost_price'] * $this->premium_ratio, 2);
+                $pcYanglaojinGongxian = static::getPvYanglaojinScore($value['cost_price']);
 
-                $fileSchedValue[$key]['cost_price'] = bcadd((string)$value['cost_price'], (string)$premium, 2);
+                $fileSchedValue[$key]['price'] = $pcYanglaojinGongxian['cost_price'];
+                $fileSchedValue[$key]['yanglaojin'] = $pcYanglaojinGongxian['yanglaojin'];
+                $fileSchedValue[$key]['pv'] = $pcYanglaojinGongxian['pv'];
+                $fileSchedValue[$key]['score'] = $pcYanglaojinGongxian['score'];
+                $fileSchedValue[$key]['gongxian'] = $pcYanglaojinGongxian['gongxian'];
 
-                $pv = bcmul((string)$premium, $this->pv_ratio, 2);
-                $fileSchedValue[$key]['yanglaojin'] = bcmul((string)$premium, $this->yanglaojin_ratio, 2);
-                $fileSchedValue[$key]['pv'] = $fileSchedValue[$key]['score'] = $fileSchedValue[$key]['gongxian'] = $pv;
-
-                unset($fileSchedValue[$key]['channel_price']);
+//                unset($fileSchedValue[$key]['channel_price']);
             }
         }
 
@@ -121,18 +121,41 @@ class MovieRepository extends BaseRepository
      */
     public function getSchedSeat($relation_id = '', $sched_sign = '')
     {
-        return DouHuoMallFilmApiRequest::getSchedSeat($relation_id, $sched_sign);
+        $result = DouHuoMallFilmApiRequest::getSchedSeat($relation_id, $sched_sign);
+
+        $schedSeatList = (isset($result['code']) && ($result['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) ? $result['data'] : [];
+        foreach ($schedSeatList as $key => $value) {
+            $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($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'];
+            $schedSeatList[$key]['score'] = $pcYanglaojinGongxian['score'];
+            $schedSeatList[$key]['gongxian'] = $pcYanglaojinGongxian['gongxian'];
+            $schedSeatList[$key]['relation_id'] = $relation_id; // 场次ID
+            $schedSeatList[$key]['sched_sign'] = $sched_sign; // 场次编码
+        }
+
+        return $schedSeatList;
     }
 
     /**
      * 锁座订单
-     * @param $sched_sign
-     * @param $seat_sign
-     * @param $channel_type
-     * @param $third_order
-     * @param $order_price
-     * @param $phone
-     * @return mixed|string
+     *
+     * @param $userinfo
+     * @param $params
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
     public function submitOrder($userinfo, $params)
     {
@@ -140,49 +163,57 @@ class MovieRepository extends BaseRepository
         $storeOrder = app()->make(StoreOrderRepository::class);
         $order_sn = $storeOrder->getNewOrderId() . '0';
 
-        $order_price = round($params['number'] * $params['price'], 2);
-        $submitOrder = DouHuoMallFilmApiRequest::submitOrder($userinfo->phone, $params['channel_type'], $params['sched_sign'], $order_sn, $order_price);
-        if (!empty($submitOrder) && isset($submitOrder['code']) && ($submitOrder['code'] == 200) && isset($submitOrder['data']['plat_order'])) {
+        /** @var CinemaSchedRepository $cinemaSchedRepository */
+        $cinemaSchedRepository = app()->make(CinemaSchedRepository::class);
+        $sched = $cinemaSchedRepository->getCinemaSchedInfo($params['relation_id'], $params['sched_sign']);
+        if (empty($sched)) throw new ValidateException('观影场次不存在');
+
+        $seat_sign = json_decode($params['seat_sign'], true);
+        $order_price = round($sched['price'] * count($seat_sign), 2);
+        $submitOrder = DouHuoMallFilmApiRequest::submitOrder($userinfo->phone, $params['channel_type'], $params['sched_sign'], $seat_sign, $order_sn, $order_price);
+        if (!empty($submitOrder) && isset($submitOrder['code']) && ($submitOrder['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE) && isset($submitOrder['data']['plat_order'])) {
+            /** @var CinemaRepository $cinemaRepository */
+            $cinemaRepository = app()->make(CinemaRepository::class);
+            $cinema = $cinemaRepository->getCinemaInfo($sched['cinema_sign']);
+
             $_order = [
                 'uid' => $userinfo->uid,
                 'mobile' => $userinfo->phone,
                 'order_sn' => $order_sn,
                 'plat_order' => $submitOrder['data']['plat_order'],
-                'price' => $params['price'],
-                'number' => $params['number'],
+                'price' => $sched['price'],
+                'number' => count($seat_sign),
                 'order_price' => $order_price,
                 'channel_type' => $params['channel_type'],
-                'pay_type' => $params['pay_type'],
-                'city_sign' => $params['city_sign'],
-                'city_name' => $params['city_name'],
-                'area_code' => $params['area_code'],
-                'area_name' => $params['area_name'],
-                'cinema_sign' => $params['cinema_sign'],
-                'cinema_name' => $params['cinema_name'],
-                'address' => $params['address'],
-                'longitude' => $params['longitude'],
-                'latitude' => $params['latitude'],
-                'hall_sign' => $params['hall_sign'],
-                'hall_name' => $params['hall_name'],
-                'relation_id' => $params['relation_id'],
-                'sched_sign' => $params['sched_sign'],
-                'film_sign' => $params['film_sign'],
-                'film_name' => $params['film_name'],
-                'show_date' => $params['show_date'],
-                'show_time' => $params['show_time'],
-                'sched_seat' => $params['sched_seat'],
+                'city_sign' => $cinema['city_sign'],
+                'city_name' => $cinema['city_name'],
+                'area_code' => $cinema['area_sign'],
+                'area_name' => $cinema['area_name'],
+                'cinema_sign' => $cinema['cinema_sign'],
+                'cinema_name' => $cinema['cinema_name'],
+                'address' => $cinema['address'],
+                'longitude' => $cinema['longitude'],
+                'latitude' => $cinema['latitude'],
+                'hall_sign' => $sched['hall_sign'],
+                'hall_name' => $sched['hall_name'],
+                'relation_id' => $sched['relation_id'],
+                'sched_sign' => $sched['sched_sign'],
+                'film_sign' => $sched['film_sign'],
+                'film_name' => $sched['film_name'],
+                'show_date' => $sched['show_date'],
+                'show_time' => $sched['show_time'],
+                'sched_seat' => $sched['sched_seat'],
                 'create_time' => time()
             ];
 
-            $group = Db::transaction(function () use ($userinfo, $_order) {
+            $order_sn = Db::transaction(function () use ($userinfo, $_order) {
                 $_order = $this->dao->create($_order);
-                if ($_order) return ['code' => ApiResponseService::DEFAULT_SUCCESS_CODE, 'msg' => '下单成功', 'data' => ['order_sn' => $_order['order_sn']]];
-
-                throw new ValidateException('下单失败');
+                if ($_order) return $_order['order_sn'];
+                throw new ValidateException('锁座下单失败');
             });
-            return $group;
+            return $order_sn;
         } else {
-            return $submitOrder;
+            throw new ValidateException('锁座下单失败');
         }
     }
 
@@ -202,7 +233,7 @@ class MovieRepository extends BaseRepository
 //                return $this->pay(
 //                    $_order['pay_type'], $userinfo->wechat_user_id, $_order, $_order['film_name'], env('APP_URL') . "/api/hf_notify/movie",
 //                    'delay');
-        return DouHuoMallFilmApiRequest::confirmOrder($third_order, $order_price);
+        return DouHuoMallFilmApiRequest::confirmOrder($orderinfo['order_sn'], $orderinfo['order_price']);
     }
 
     /**
@@ -315,4 +346,20 @@ class MovieRepository extends BaseRepository
 
         return compact('city_name', 'initial');
     }
+
+    /**
+     * 获取pv、养老金、售价、积分
+     *
+     * @param $cost_price
+     * @return array
+     */
+    public static function getPvYanglaojinScore($cost_price)
+    {
+        $premium = round($cost_price * self::premium_ratio, 2);
+        $cost_price = bcadd((string)$cost_price, (string)$premium, 2);
+        $pv = $gongxian = $score = bcmul((string)$premium, self::pv_ratio, 2);
+        $yanglaojin = bcmul((string)$premium, self::yanglaojin_ratio, 2);
+
+        return compact('premium', 'cost_price', 'pv', 'yanglaojin', 'gongxian', 'score');
+    }
 }

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

@@ -1134,14 +1134,7 @@ class StoreOrderRepository extends BaseRepository
                             /** @var UserThirdRepository $orderThird */
                             $orderThird = app()->make(\app\common\repositories\user\UserThirdRepository::class);
                             //预估养老金
-//                            $orderThird->yuguOrder(
-//                                $_order->order_id,
-//                                $commissionMoney,
-//                                $uid,
-//                                $_order->order_sn,
-//                                $type_shop,
-//                                'order_fugou'
-//                            );
+
                             //复购区 - 预估养老金
                             $orderThird->repurchaseAreaEstimateAnnuityOrder(
                                 $_order->order_id,
@@ -7442,9 +7435,13 @@ class StoreOrderRepository extends BaseRepository
                 ->whereIn('status', [0, 1, 2, 3])
                 ->sum('pay_price');
 //            if ($pay_price >= 365) {
-            Db::name('user')->where('uid', $uid)->whereNotIn('user_group', [3, 4, 5, 6])->update([
-                'user_group' => 2
-            ]);
+//            Db::name('user')->where('uid', $uid)->whereNotIn('user_group', [3, 4, 5, 6])->update([
+//                'user_group' => 2
+//            ]);
+            // 设置用户 身份
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            $userRepository->setUserIdentity($uid);
         }
 
         $shouxufei = systemConfig('online_yanglao');
@@ -7473,9 +7470,12 @@ class StoreOrderRepository extends BaseRepository
         }
 
         if ($product_id == 15323) {
-            Db::name('user')->where('uid', $uid)->whereNotIn('user_group', [3, 4, 5, 6])->update([
-                'user_group' => 4//升級創客
-            ]);
+//            Db::name('user')->where('uid', $uid)->whereNotIn('user_group', [3, 4, 5, 6])->update([
+//                'user_group' => 4//升級創客
+//            ]);
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            $userRepository->setUserIdentity($uid);
         }
 
         Db::name('store_order')->where('order_id', $order_id)
@@ -9553,7 +9553,7 @@ class StoreOrderRepository extends BaseRepository
 
                 // Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,"contribute"=>$con,"score"=>$score]);
 
-                $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'], 11, "购买精彩生活商品赠送贡献值");
                 // 积分
@@ -9665,9 +9665,9 @@ class StoreOrderRepository extends BaseRepository
                         //积分
                         $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 11, "精彩生活区商品赠送积分");
                         // //推广佣金
-                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $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'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
                         //养老金
-                        $this->bill_user_log($spread_data['uid'], round($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'], round($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);
                     }
 
                     //普通用户推广人
@@ -9691,7 +9691,7 @@ class StoreOrderRepository extends BaseRepository
 
                         //推广养老金
                         //推广佣金
-                        $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $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'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
                         // 贡献值
                         $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值");
                         //积分
@@ -9720,7 +9720,7 @@ class StoreOrderRepository extends BaseRepository
 
                         // Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
                         //推广佣金
-                        $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $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'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
 
                     }
 
@@ -9774,8 +9774,7 @@ class StoreOrderRepository extends BaseRepository
 
             // Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,'contribute'=> $gxz_amount_mine,'score'=> $jf_amount_mine]);
 
-            $this->bill_user_log($user_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $group_order['group_order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
-
+            $this->bill_user_log($user_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
             $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1);
             $this->score_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送积分", 1);
 
@@ -9890,16 +9889,16 @@ class StoreOrderRepository extends BaseRepository
                     $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
 
                     //养老金
-                    $this->bill_user_log($spread_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $group_order['group_order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
+                    $this->bill_user_log($spread_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
                     //佣金
-                    $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
+                    $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
                     //复购金
                     $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
 
                 }
 
                 //普通的用户推广人
-                if ($spread_data['user_group'] == 1) {
+                if ($spread_data['user_group'] == 1) {  
 
                     //获取贡献值和积分和佣金
                     $gx_jf = $spread_data['contribute'] + round($pv * 0.21, 2);
@@ -9914,10 +9913,10 @@ class StoreOrderRepository extends BaseRepository
 
 
                     //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $gx_jf,'score'=> $gx_jf,'brokerage_price'=> $yj_amount,'fugou'=>$fgj_amount]);
-                    $this->con_log($spread_data['uid'], round($pv * 0.21, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
-                    $this->score_log($spread_data['uid'], round($pv * 0.21, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
+                    $this->con_log($spread_data['uid'], round($pv * 0.3, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
+                    $this->score_log($spread_data['uid'], round($pv * 0.3, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
                     //推广佣金
-                    $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
+                    $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
                 }
 
 
@@ -9938,9 +9937,9 @@ class StoreOrderRepository extends BaseRepository
 
                 $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
                 //养老金
-                $this->bill_user_log($spread_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $group_order['group_order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
+                $this->bill_user_log($spread_data['uid'], round($pv * 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
                 //佣金
-                $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
+                $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id']);
                 //复购金
                 $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
 
@@ -10009,20 +10008,20 @@ class StoreOrderRepository extends BaseRepository
 
                 $merchant_user_data = Db::name('user')->where('uid', $merchant_data['uid'])->find();
 
-                if (!empty($merchant_user_data)) {
+                if (!empty($merchant_data) && !empty($merchant_user_data)) {
 
 
                     $yj_amount_90 = round($pv * 0.035, 2) * 0.9;
                     $fgj_amount_10 = round($pv * 0.035, 2) * 0.1;//推广者的佣金抽10%到个人复购金
 
-                    $yj_amount = $merchant_data['brokerage_price'] + $yj_amount_90;
-                    $fgj_amount = $merchant_data['fugou'] + $fgj_amount_10;
+                    $yj_amount = $merchant_user_data['brokerage_price'] + $yj_amount_90;
+                    $fgj_amount = $merchant_user_data['fugou'] + $fgj_amount_10;
                     $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
 
 
                     // Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
                     //推广佣金
-                    $this->bill_user_log($merchant_data['uid'], round($pv * 0.35, 2), $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . round($pv * 0.35, 2), $store_order_data['mer_id']);
+                    $this->bill_user_log($merchant_data['uid'], round($pv * 0.35, 2), $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得拥金' . round($pv * 0.35, 2), $store_order_data['mer_id']);
                 }
 
             }
@@ -10044,12 +10043,18 @@ class StoreOrderRepository extends BaseRepository
             if ($totalPayPrice >= 1180 && $totalPayPrice < 11800) {
 
                 if ($userdata['user_group'] <= 1) {
-                    Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 2]);
+//                    Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 2]);
+                    /** @var UserRepository $userRepository */
+                    $userRepository = app()->make(UserRepository::class);
+                    $userRepository->setUserIdentity($store_order_data['uid']);
                 }
 
             } else if ($totalPayPrice >= 11800) {
                 if ($userdata['user_group'] <= 2) {
-                    Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 3]);
+//                    Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 3]);
+                    /** @var UserRepository $userRepository */
+                    $userRepository = app()->make(UserRepository::class);
+                    $userRepository->setUserIdentity($store_order_data['uid']);
                 }
             }
 
@@ -10555,6 +10560,40 @@ class StoreOrderRepository extends BaseRepository
         return compact('hf_member_id', 'hf_platform_member_id', 'api_key');
     }
 
+
+    /**
+     * 获取分账账号信息话费专用
+     *
+     * @param $order
+     * @param $dst_mer_id
+     * @param $alhf_member_id
+     * @return array
+     */
+    public function getIndependentAccountHuafei($order, $dst_mer_id, $alhf_member_id)
+    {
+        if ($order['pay_type'] == 1) {
+            $hf_member_id = Db::name('merchant_member')->where('mer_id', $order['mer_id'])->where("type", 3)->value('member_id');
+            $api_key = 'api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
+            $type = 3;
+
+            // 平台特殊账户
+            $hf_platform_member_id = Db::name('merchant_member')->where(['mer_id' => $dst_mer_id, 'type' => $type])->value('member_id');
+        } else {
+            //支付宝
+            $hf_member_id = $alhf_member_id;
+            $api_key = 'api_live_b23537ed-64b8-45d6-832e-fb228aa9e0a9';
+
+            // 平台特殊账户
+            $hf_platform_member_id = Db::name('merchant_member')->where(['mer_id' => $dst_mer_id, 'type' => 1])->value('member_id');
+        }
+
+        return compact('hf_member_id', 'hf_platform_member_id', 'api_key');
+    }
+
+
+
+
+
     /**
      * 预分账处理
      *
@@ -10607,6 +10646,63 @@ class StoreOrderRepository extends BaseRepository
         return false;
     }
 
+
+
+
+    /**
+     * 预分账处理话费专用
+     *
+     * @param $order
+     * @param $api_key
+     * @param $hf_member_id
+     * @param $hf_platform_member_id
+     * @param $merchant_profit
+     * @param $platform_profit
+     * @param $dst_mer_id
+     * @return bool
+     * @throws DbException
+     */
+    public function prepareExecuteIndependentAccountHuafei($order, $group_order, $api_key, $hf_member_id, $hf_platform_member_id, $merchant_profit, $platform_profit, $dst_mer_id = 0)
+    {
+        $members[] = [
+            'member_id' => $hf_member_id,
+            'amount' => $merchant_profit,
+            'fee_flag' => 'Y'
+        ];
+        if (!empty($hf_platform_member_id) && ($platform_profit > 0)) {
+            $members[] = [
+                'member_id' => $hf_platform_member_id,
+                'amount' => $platform_profit,
+                'fee_flag' => 'N'
+            ];
+        }
+
+        $requestId = ShouxinyiApiRequest::getOrderNumber('split');
+        $params = [
+            'payment_id' => $group_order['hf_pay_id'],
+            'order_no' => $requestId,
+            'confirm_amt' => $group_order['pay_price'],
+            'div_members' => $members
+        ];
+
+        $params['api_key'] = $api_key;
+
+        // 记录分账订单
+        $this->recordIndependentAccount($order['mer_id'], $dst_mer_id, $group_order, $requestId, $merchant_profit, $platform_profit);
+
+        Db::name("log")->insert(array('data' => '汇付分账参数-----' . json_encode($params, JSON_FORCE_OBJECT)));//日志记录
+        $res = $this->payment_confirm_create_traits($params);
+        Db::name("log")->insert(array('data' => '汇付分账结果-----' . json_encode($res, JSON_FORCE_OBJECT)));//日志记录
+        if ($res['status'] == 'succeeded') {
+            Db::name("store_split_order")->where('requestId', $requestId)->update(['status' => 1, 'hf_pay_id' => $res['id']]);
+            return true;
+        }
+        return false;
+    }
+
+
+
+
     /**
      * 记录分账订单
      *

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

@@ -256,8 +256,51 @@ class ProductReplyRepository extends BaseRepository
 
     /*用户评价列表*/
     public function  getReplyList($where=[],$page=1, $limit=10){
-        $count =  Db::name("store_product_reply")->where($where)->count();
-        $list = Db::name("store_product_reply")->page($page, $limit)->where($where)->select();
+        $count = Db::name("store_product_reply")
+            ->where($where)
+            ->count();
+        $list = Db::name("store_product_reply")
+            //            ->alias('spr')  // 给主表起个别名
+            //            ->join('store_order_product rsop', 'spr.order_product_id = rsop.order_product_id', 'LEFT')  // 左连接
+            //            ->field('spr.*, rsop.*')
+            ->where($where)
+            ->page($page, $limit)
+            ->select()
+            ->toArray();
+
+        $order_product_id_list = array_column($list,'order_product_id');
+        $order_product_info_list = Db::name("store_order_product")
+            ->whereIn('order_product_id',$order_product_id_list)
+            ->select()
+            ->toArray();
+        $order_product_info_map = array_column($order_product_info_list, null, 'order_product_id');
+
+        $mer_id_list = array_column($list,'mer_id');
+        $mer_info_list = Db::name("merchant")
+            ->whereIn('mer_id',$mer_id_list)
+            ->select()
+            ->toArray();
+        $mer_info_map = array_column($mer_info_list, null, 'mer_id');
+
+        foreach ($list as &$item) {
+            if (!empty($order_product_info_map[$item['order_product_id']])) {
+                if (!empty($order_product_info_map[$item['order_product_id']]['cart_info'])) {
+                    $cart_info = json_decode($order_product_info_map[$item['order_product_id']]['cart_info']);
+                    if (json_last_error() == JSON_ERROR_NONE) {
+                        $order_product_info_map[$item['order_product_id']]['cart_info'] = $cart_info;
+                    }
+                }
+                $item['order_product_info'] = $order_product_info_map[$item['order_product_id']];
+            } else {
+                $item['order_product_info'] = new \stdClass();
+            }
+
+            if (!empty($mer_info_map[$item['mer_id']])) {
+                $item['mer_info'] = $mer_info_map[$item['mer_id']];
+            } else {
+                $item['mer_info'] = new \stdClass();
+            }
+        }
         return compact('count', 'list');
     }
 }

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/common/repositories/user/UserIdentityRepository.php

@@ -0,0 +1,110 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-05-07
+ *
+ * 
+ */
+
+namespace app\common\repositories\user;
+
+
+use app\common\dao\user\UserIdentityDao;
+use app\common\repositories\BaseRepository;
+use FormBuilder\Exception\FormBuilderException;
+use FormBuilder\Factory\Elm;
+use FormBuilder\Form;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+use think\facade\Route;
+
+/**
+ * Class UserIdentityRepository
+ * @package app\common\repositories\user
+ * @author xaboy
+ * @day 2020-05-07
+ * @mixin UserIdentityDao
+ */
+class UserIdentityRepository extends BaseRepository
+{
+    /**
+     * @var UserIdentityDao
+     */
+    protected $dao;
+
+    /**
+     * UserGroupRepository constructor.
+     * @param UserIdentityDao $dao
+     */
+    public function __construct(UserIdentityDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param array $where
+     * @param $page
+     * @param $limit
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author xaboy
+     * @day 2020-05-07
+     */
+    public function getList(array $where, $page, $limit)
+    {
+        $query = $this->dao->search($where);
+        $count = $query->count($this->dao->getPk());
+        $list = $query->page($page, $limit)->select();
+        return compact('count', 'list');
+    }
+
+    /**
+     * @param null $id
+     * @param array $formData
+     * @return Form
+     * @throws FormBuilderException
+     * @author xaboy
+     * @day 2020-05-07
+     */
+    public function form($id = null, array $formData = [])
+    {
+        $action = Route::buildUrl('configIdentityUpdate' , compact('id'))->build();
+        return Elm::createForm($action, [
+            Elm::number('arrive_num_own', '个人达标贡献值')->min(0)->size('large'),
+            Elm::number('arrive_num_team', '团队达标贡献值')->min(0)->size('large')
+        ])->setTitle('业务员升级设置')->formData($formData);
+    }
+
+    /**
+     * @param $id
+     * @return Form
+     * @throws FormBuilderException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author xaboy
+     * @day 2020-05-07
+     */
+    public function updateForm($id)
+    {
+        return $this->form($id, $this->dao->get($id)->toArray());
+    }
+
+    /**
+     * @param array $where
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getIdentityList(array $where = [])
+    {
+        $query = $this->dao->search($where);
+        return $query->select()->toArray();
+    }
+}

app/common/repositories/user/UserOfflineRechargeRepository.php

@@ -171,8 +171,14 @@ class UserOfflineRechargeRepository extends BaseRepository
                     // //同步复购金
                     // Db::name("user_sign_fugou")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
                     
-                    // //同步贡献值
-                    // Db::name("user_sign_gongxian")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+                    //同步贡献值
+                    $gongxian = Db::name('user_sign_gongxian')->where('order_id', $order->id)->find();
+                    if($gongxian){
+                        Db::name("user_sign_gongxian")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+                        $user_contribute = Db::name('user')->where('order_id', $order->id)->where('uid', $unionUser->uid)->value('contribute');
+                        $user_contribute = bcadd($user_contribute, $gongxian['number'], 2);
+                        Db::name('user')->where('uid', $unionUser->uid)->update(['contribute'=>$user_contribute]);
+                    }
 
 
 

app/common/repositories/user/UserRepository.php

@@ -2881,7 +2881,6 @@ class UserRepository extends BaseRepository
         }
         $paramStr =  $paramStr.'sign='.urlencode($sign);
         return $paramStr;
-
     }
 
     /*
@@ -3013,7 +3012,7 @@ class UserRepository extends BaseRepository
             $request->setGrantType("authorization_code");
             $request->setCode($authorization_code);
             $result = $aop->execute($request);
-
+            Db::name('log')->insert(['data'=>'支付宝相关信息']);
             if (isset($result->alipay_system_oauth_token_response->user_id)) {
                 $return['user_id'] = $result->alipay_system_oauth_token_response->user_id;
                 $return['msg'] = $result->alipay_system_oauth_token_response->access_token;
@@ -3226,4 +3225,206 @@ class UserRepository extends BaseRepository
         $resultArray = array_diff($originalArray, [$uid]);
         return $resultArray;
     }
+
+
+    /**
+     * 设置用户 身份
+     * @param $uid
+     * @param $identityId
+     * @return int|mixed|null
+     * @throws DbException
+     */
+    public function setUserIdentity($uid, $identityId = null)
+    {
+        $result = null;
+        if (empty($identityId)) {
+            $identityId = $this->getUserIdentity($uid);
+        }
+        $this->dao->update($uid, ['user_group' => $identityId]);
+        return $identityId;
+    }
+
+    /**
+     * 获取用户 身份
+     * @param $uid
+     * @return int|mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getUserIdentity($uid)
+    {
+        // 1、获取所有等级信息
+        /** @var UserIdentityRepository $identityRepository */
+        $identityRepository = app()->make(UserIdentityRepository::class);
+        $identityList = $identityRepository->getIdentityList();
+
+        // 2、获取身份需要的最深等级
+        $lowerLevelNumList = array_column($identityList, 'lower_level_num');
+        $lowerLevelNumMax = max($lowerLevelNumList);
+        $lowerLevelNumMin = min($lowerLevelNumList);
+        $needLower = $lowerLevelNumMax;
+        if($lowerLevelNumMin == 0) {
+            $needLower = $lowerLevelNumMin;
+        }
+
+        // 3、获取下级用户 贡献值
+        $userContributionSumMap = [];
+        $uidContributeList = $this->getUidContributeListBySpreadUidList([$uid]);
+        foreach ($uidContributeList as $uidContribute) {
+            $userContributionSumMap[$uidContribute['uid']] = $this->getContributionSumByLevel([$uidContribute['uid']], $needLower);
+            $userContributionSumMap[$uidContribute['uid']][0] = $uidContribute['contribute'];
+        }
+
+        // 4、获取个人贡献值
+        $userData = $this->dao->get($uid)->toArray();
+
+        // 5、当前用户等级
+        $identityId = 0;
+        usort($identityList, function ($a, $b) {
+            return $b['user_group_id'] <=> $a['user_group_id'];  // 反转顺序，倒序排列
+        });
+        foreach ($identityList as $item) {
+            $lowerLevelNum = $item['lower_level_num']??0;
+
+            $arriveNumOwn = $userData['contribute'];
+            $arriveNumTeam = 0;
+            $subordinateContribution = [];
+
+            foreach ($userContributionSumMap as $key => $value) {
+                $subordinateContribution[$key] = 0;
+                if ($lowerLevelNum != 0) {
+                    foreach ($value as $k => $v) {
+                        if ($k <= $lowerLevelNum) {
+                            $subordinateContribution[$key] += $v;
+                        } else {
+                            break;
+                        }
+                    }
+                } else {
+                    $subordinateContribution[$key] = array_sum($value);
+                }
+            }
+            if (!empty($subordinateContribution)) {
+                // 大区业绩
+                $dqYj = max($subordinateContribution);
+                // 总业绩
+                $zYj = array_sum($subordinateContribution);
+                // 小区团体业绩
+                $arriveNumTeam = bcsub($zYj, $dqYj, 2);
+            }
+            if ($item['arrive_num_own'] <= $arriveNumOwn && $item['arrive_num_team'] <= $arriveNumTeam) {
+                $identityId = $item['user_group_id'];
+                break;
+            }
+        }
+        return $identityId;
+    }
+
+    /**
+     * 获取该会员的所有下级会员
+     */
+    public function getUidContributeListBySpreadUidList(array $uidList)
+    {
+        return Db::name("user")
+            ->whereIn("spread_uid", $uidList)
+            ->field("uid, contribute, spread_uid")
+            ->select()
+            ->toArray();
+    }
+
+    /**
+     * 计算指定用户下属每一层级的总贡献值。
+     *
+     * @param array $initialUserIds 初始用户ID列表 (视为第0层)。
+     * @param int $maxDepth 需要查询的最大深度（相对于初始列表）。
+     *                      0 表示查询所有层级直到末端。
+     *                      1 表示只计算第1层（直接下级）的总贡献。
+     *                      N 表示计算到第 N 层（包含第N层）的总贡献。
+     * @return array 返回一个数组，键是层级号（从1开始），值是该层级所有用户的贡献值总和。
+     *               例如：[ 1 => 600, 2 => 1300 ]
+     */
+    public function getContributionSumByLevel(array $initialUserIds, int $maxDepth = 0): array
+    {
+        $levelContributions = []; // 结果数组 [level => total_contribution]
+        if (empty($initialUserIds)) {
+            return $levelContributions;
+        }
+
+        $currentLevelIds = $initialUserIds; // 当前层级的用户ID (初始为第0层)
+        $currentLevel = 0; // 当前层级号
+
+        // 使用一个集合跟踪所有已处理过的下级用户ID，防止重复计算和循环
+        $processedSubordinateIds = [];
+
+        while (!empty($currentLevelIds)) {
+            // 计算下一层级的编号
+            $nextLevel = $currentLevel + 1;
+
+            // 检查是否达到最大深度限制
+            if ($maxDepth > 0 && $nextLevel > $maxDepth) {
+                break; // 停止查询更深的层级
+            }
+
+            // 批量查询当前层级用户的直接下级
+            // 使用 array_chunk 防止 WHERE IN 子句过长 (根据数据库限制调整 chunkSize)
+            $chunkSize = 500;
+            $subordinatesOfCurrentLevel = [];
+            foreach(array_chunk($currentLevelIds, $chunkSize) as $chunk) {
+                $subordinatesChunk = Db::name('user')
+                    ->field('uid, contribute') // 只需要下级的uid和贡献值
+                    ->whereIn('spread_uid', $chunk) // spread_uid 在当前层级用户块中
+                    ->select()
+                    ->toArray();
+                $subordinatesOfCurrentLevel = array_merge($subordinatesOfCurrentLevel, $subordinatesChunk);
+            }
+
+            // 如果没有找到任何下级，结束循环
+            if (empty($subordinatesOfCurrentLevel)) {
+                break;
+            }
+
+            $nextLevelTotalContribution = 0;
+            $nextLevelIds = []; // 存储下一轮需要查询的用户ID
+
+            // 遍历找到的所有下级
+            foreach ($subordinatesOfCurrentLevel as $subordinate) {
+                $subordinateId = $subordinate['uid'];
+                $subordinateContribution = $subordinate['contribute'] ?? 0; // 安全获取，默认为0
+
+                // 累加下一层级的总贡献值
+                // 注意：这里简单累加，如果一个下级同时被当前层多个用户推荐，其贡献会被计算多次
+                // 如果要求每个下级只贡献一次（即使有多个上级），需要调整逻辑，
+                // 例如在累加前检查 $processedSubordinateIds
+
+                // --- 修改点：确保每个下级贡献只被计算一次 ---
+                // if (!isset($processedSubordinateIds[$subordinateId])) { // 如果这个下级还没被处理过
+                $nextLevelTotalContribution += (float)$subordinateContribution;
+                // }
+                // 注释掉上面的检查，因为用户描述似乎是按层级直接累加，不管这个下级是否被上层处理过。
+                // 如果A1和A2都属于第1层，他们各自的下级B1和B2都属于第2层，B1和B2的贡献值直接加到第2层的总和里。
+                // 如果需要严格按“人”计算，即使一个人出现在多层或被多人推荐也只算一次，则需要解开注释并调整
+
+                // 收集下一轮需要查询的用户ID，同样需要防止重复处理
+                if (!isset($processedSubordinateIds[$subordinateId])) {
+                    $nextLevelIds[] = $subordinateId;
+                    // 标记这个下级ID已处理过，避免在更深层级中再次将其加入查询队列
+                    $processedSubordinateIds[$subordinateId] = true;
+                }
+
+            }
+
+            // 存储下一层级的总贡献值 (只有当贡献值大于0或你想记录空层级时)
+            // 根据例子，我们只记录有贡献的层级，或者至少有用户的层级
+            if (!empty($subordinatesOfCurrentLevel)) { // 只要找到了下级就记录该层
+                $levelContributions[$nextLevel] = $nextLevelTotalContribution;
+            }
+
+            // 准备下一轮迭代
+            $currentLevelIds = array_unique($nextLevelIds); // 去重下一层的用户ID
+            $currentLevel = $nextLevel; // 更新当前层级
+        }
+
+        return $levelContributions;
+    }
 }

app/controller/admin/system/config/Identity.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-03-24
+ *
+ * 
+ */
+
+namespace app\controller\admin\system\config;
+
+
+use crmeb\basic\BaseController;
+use app\common\repositories\user\UserIdentityRepository;
+use FormBuilder\Exception\FormBuilderException;
+use think\App;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+
+/**
+ * Class Config
+ * @package app\controller\admin\system\config
+ * @author xaboy
+ * @day 2020-03-27
+ */
+class Identity extends BaseController
+{
+    /**
+     * @var UserIdentityRepository
+     */
+    protected $repository;
+
+    /**
+     * Config constructor.
+     * @param App $app
+     * @param UserIdentityRepository $repository
+     */
+    public function __construct(App $app, UserIdentityRepository $repository)
+    {
+        parent::__construct($app);
+        $this->repository = $repository;
+    }
+
+    /**
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author xaboy
+     * @day 2020-03-31
+     */
+    public function lst()
+    {
+        $where = $this->request->params(['keyword']);
+        [$page, $limit] = $this->getPage();
+        $lst = $this->repository->getList($where, $page, $limit);
+
+        return app('json')->success($lst);
+    }
+
+    /**
+     * @param int $id
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @throws FormBuilderException
+     * @author xaboy
+     * @day 2020-03-31
+     */
+    public function updateTable($id)
+    {
+        if (!$this->repository->exists($id)) app('json')->fail('数据不存在');
+        $form = $this->repository->updateForm($id);
+        return app('json')->success(formToData($form));
+    }
+
+    /**
+     * @param int $id
+     * @return mixed
+     * @throws DbException
+     * @author xaboy
+     * @day 2020-03-27
+     */
+    public function update($id)
+    {
+        $data = $this->request->params(['arrive_num_own', 'arrive_num_team']);
+        $this->repository->update($id, $data);
+        return app('json')->success('修改成功');
+    }
+
+}

app/controller/api/Auth.php

@@ -1899,11 +1899,12 @@ class Auth extends BaseController
             if(empty($sessionKey['sessionKey'])||empty($encryptedData['encryptedData'])||empty($iv['iv'])){
                 return app('json')->fail('参数不正确');
             }
-            $appid = 'wx82986c4471ce7efc';
-            if($this->source=='yhc'){
-                $appid = 'wx82986c4471ce7efc';
-            }
-            $appid = 'wx7b4d857deb0447f3';
+//            $appid = 'wx82986c4471ce7efc';
+//            if($this->source=='yhc'){
+//                $appid = 'wx82986c4471ce7efc';
+//            }
+//            $appid = 'wx7b4d857deb0447f3';
+            $appid = 'wx9082e5ac2fdb513f';
             $sessionKey =str_replace(' ','+', $sessionKey['sessionKey']);
 
             $encryptedData=str_replace(' ','+',$encryptedData['encryptedData']);

app/controller/api/Notify.php

@@ -3,6 +3,7 @@ namespace app\controller\api;
 
 use AdaPaySdk\AdapayTools;
 use app\common\repositories\store\order\StoreRefundOrderRepository;
+use app\common\repositories\user\UserRepository;
 use app\controller\api\merchant\sxy\Access;
 use app\controller\api\store\service\Huafei;
 use think\facade\Db;
@@ -178,7 +179,7 @@ class Notify
 
                                     //Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,"contribute"=>$con,"score"=>$score]);
 
-                                    $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'],11,"购买精彩生活商品赠送贡献值");
                                     $this->score_log($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送积分");
 
@@ -291,17 +292,19 @@ class Notify
                                             //积分
                                             $this->score_log($spread_data['uid'],$ssf,$store_order_data['order_id'],11,"精彩生活区商品赠送积分");
                                             // //推广佣金
-                                            $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$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'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
                                             //养老金
-                                            $this->bill_user_log($spread_data['uid'],round($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'],round($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);
                                         }
 
                                         //普通用户推广人
                                         if($spread_data['user_group'] == 1){
                                             //给推广者分配佣金
                                             // $ylj_amount = $spread_data['annuity'] + round($pv * 0.3,2);
-                                            $yj_amount_90 = round($pv * 0.21,2) * 0.9;
-                                            $fgj_amount_10 = round($pv * 0.21,2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                            // $yj_amount_90 = round($pv * 0.21,2) * 0.9;
+                                            $yj_amount_90 = round($pv * 0.3,2) * 0.9;
+                                            // $fgj_amount_10 = round($pv * 0.21,2) * 0.1;//推广者的佣金抽10%到个人复购金
+                                            $fgj_amount_10 = round($pv * 0.3,2) * 0.1;//推广者的佣金抽10%到个人复购金
 
                                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -309,8 +312,10 @@ class Notify
 
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
 
-                                            $con = $spread_data['contribute'] + round($pv * 0.21,2);
-                                            $score = $spread_data['score'] + round($pv * 0.21,2);
+                                            // $con = $spread_data['contribute'] + round($pv * 0.21,2);
+                                            $con = $spread_data['contribute'] + round($pv * 0.3,2);
+                                            // $score = $spread_data['score'] + round($pv * 0.21,2);
+                                            $score = $spread_data['score'] + round($pv * 0.3,2);
 
                                             //贡献值和积分
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(["contribute"=>$con,"score"=>$score]);
@@ -318,9 +323,11 @@ class Notify
                                             //推广养老金
 
                                             //推广佣金
-                                            $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
-                                            $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送贡献值");
-                                            $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送积分");
+                                            $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
+                                            // $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送贡献值");
+                                            $this->con_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送贡献值");
+                                            // $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送积分");
+                                            $this->score_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送积分");
 
 
 
@@ -352,7 +359,7 @@ class Notify
 
                                             //Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
                                             //推广佣金
-                                            $this->bill_user_log($merchant_data['uid'],  $yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.  $yj_amount_90,$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'],'推广获得拥金'.  $yj_amount_90,$store_order_data['mer_id'],0);
 
                                         }
 
@@ -410,7 +417,7 @@ class Notify
 
                                 //Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,'contribute'=> $gxz_amount_mine,'score'=> $jf_amount_mine]);
  
-                                $this->bill_user_log($user_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
+                                $this->bill_user_log($user_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
  
                                 $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
                                 $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分",1);
@@ -531,9 +538,9 @@ class Notify
                                         $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
 
                                         //养老金
-                                        $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
+                                        $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
                                         //佣金
-                                        $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'. $yj_amount_90,$store_order_data['mer_id']);
+                                        $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'. $yj_amount_90,$store_order_data['mer_id']);
                                         //复购金
                                         $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
 
@@ -549,7 +556,8 @@ class Notify
                                         // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.round($pv * 0.01,2),$store_order_data['mer_id']);
 
                                         //获取贡献值和积分和佣金
-                                        $gx_jf = $spread_data['contribute'] + round($pv * 0.21,2);
+                                        // $gx_jf = $spread_data['contribute'] + round($pv * 0.21,2);
+                                        $gx_jf = $spread_data['contribute'] + round($pv * 0.3,2);
 
                                         //$yj111 = $spread_data['brokerage_price'] + $yj1;
 
@@ -562,10 +570,12 @@ class Notify
 
 
                                         //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $gx_jf,'score'=> $gx_jf,'brokerage_price'=> $yj_amount,'fugou'=>$fgj_amount]);
-                                        $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
-                                        $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
+                                        // $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                                        $this->con_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                                        // $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
+                                        $this->score_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
                                         //推广佣金
-                                        $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id']);
+                                        $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id']);
                                     }
 
 
@@ -591,9 +601,9 @@ class Notify
 
                                     $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                                     //养老金
-                                    $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
+                                    $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
                                     //佣金
-                                    $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'. $yj_amount_90,$store_order_data['mer_id']);
+                                    $this->bill_user_log($spread_data['uid'], $yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'. $yj_amount_90,$store_order_data['mer_id']);
                                     //复购金
                                     $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
 
@@ -636,7 +646,7 @@ class Notify
 
                                         //Db::name('user')->where('uid',$merchant_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
                                         //推广佣金
-                                        $this->bill_user_log($merchant_data['uid'],round($pv * 0.35,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.round($pv * 0.35,2),$store_order_data['mer_id']);
+                                        $this->bill_user_log($merchant_data['uid'],round($pv * 0.35,2),$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得拥金'.round($pv * 0.35,2),$store_order_data['mer_id']);
                                     }
 
                                 }
@@ -1410,6 +1420,9 @@ class Notify
 
                 if (strpos($mark, "购买") !== false) {
                     Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+                    /** @var UserRepository $userRepository */
+                    $userRepository = app()->make(UserRepository::class);
+                    $userRepository->setUserIdentity($uid);
                 }
 
                 if (strpos($mark, "推广") !== false) {
@@ -1466,6 +1479,9 @@ class Notify
                 // 检查是否包含“购买”
                 if (strpos($mark, "购买") !== false) {
                     Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+                    /** @var UserRepository $userRepository */
+                    $userRepository = app()->make(UserRepository::class);
+                    $userRepository->setUserIdentity($uid);
                 }
 
                  

app/controller/api/movie/Movie.php

@@ -8,11 +8,13 @@
 namespace app\controller\api\movie;
 
 use app\common\repositories\movie\CinemaRepository;
+use app\common\repositories\movie\CinemaSchedRepository;
 use app\common\repositories\movie\FilmRepository;
 use app\common\repositories\movie\MovieRepository;
 use app\common\repositories\system\groupData\GroupDataRepository;
 use app\controller\merchant\user\User;
 use crmeb\basic\BaseController;
+use crmeb\services\ApiResponseService;
 use think\App;
 
 class Movie extends BaseController
@@ -95,19 +97,64 @@ class Movie extends BaseController
     }
 
     /**
-     * 获取影院场次列表
+     * 获取影片场次日期列表
      *
      * @return mixed
      */
-    public function getCinemaSched()
+    public function getFilmSchedDate()
     {
-        $cinema_sign = $this->request->param('cinema_sign', '');
-        if (empty($cinema_sign)) return app('json')->fail('请选择影院');
+        $film_sign = $this->request->param('film_sign', '');
+        if (empty($film_sign)) return app('json')->fail('请选择要观看的影片');
+
+        /** @var CinemaSchedRepository $cinemaSchedRepository */
+        $cinemaSchedRepository = app()->make(CinemaSchedRepository::class);
+        return app('json')->success($cinemaSchedRepository->getFilmSchedDate($film_sign));
+    }
 
+    /**
+     * 获取影片场次列表
+     *
+     * @return mixed
+     */
+    public function getFilmSched()
+    {
+        [$page, $limit] = $this->getPage();
         $film_sign = $this->request->param('film_sign', '');
-        if (empty($film_sign)) return app('json')->fail('请选择影片');
+        $longitude = $this->request->param('longitude', '');// 经度
+        $latitude = $this->request->param('latitude', '');// 纬度
+        $show_date = $this->request->param('show_date', '');
 
-        return app('json')->success($this->repository->getCinemaSched($film_sign, $cinema_sign));
+        if (empty($film_sign)) return app('json')->fail('请选择要观看的影片');
+        if (empty($longitude) || empty($latitude)) return app('json')->fail('请授权应用开启定位');
+        if (empty($show_date)) return app('json')->fail('请选择观影日期');
+
+        /** @var CinemaSchedRepository $cinemaSchedRepository */
+        $cinemaSchedRepository = app()->make(CinemaSchedRepository::class);
+        return app('json')->success($cinemaSchedRepository->getFilmSched($page, $limit, $film_sign, $longitude, $latitude, $show_date));
+    }
+
+    /**
+     * 影院影片场次列表
+     *
+     * @return mixed
+     */
+    public function getCinemaFilmSched()
+    {
+        [$page, $limit] = $this->getPage();
+        $cinema_sign = $this->request->param('cinema_sign', '');
+        $film_sign = $this->request->param('film_sign', '');
+//        $longitude = $this->request->param('longitude', '');// 经度
+//        $latitude = $this->request->param('latitude', '');// 纬度
+        $show_date = $this->request->param('show_date', '');
+
+        if (empty($cinema_sign)) return app('json')->fail('请选择观影影院');
+        if (empty($film_sign)) return app('json')->fail('请选择观影影片');
+//        if (empty($longitude) || empty($latitude)) return app('json')->fail('请授权应用开启定位');
+        if (empty($show_date)) return app('json')->fail('请选择观影日期');
+
+        /** @var CinemaSchedRepository $cinemaSchedRepository */
+        $cinemaSchedRepository = app()->make(CinemaSchedRepository::class);
+        return app('json')->success($cinemaSchedRepository->getCinemaFilmSched($page, $limit, $cinema_sign, $film_sign, date('Y') . '-' . $show_date));
     }
 
     /**
@@ -118,10 +165,10 @@ class Movie extends BaseController
     public function getSchedSeat()
     {
         $relation_id = $this->request->param('relation_id', '');
-        if (empty($cinema_sign)) return app('json')->fail('请选择场次');
+        if (empty($relation_id)) return app('json')->fail('请选择观影场次');
 
         $sched_sign = $this->request->param('sched_sign', '');
-        if (empty($film_sign)) return app('json')->fail('请选择场次');
+        if (empty($sched_sign)) return app('json')->fail('请选择观影场次');
 
         return app('json')->success($this->repository->getSchedSeat($relation_id, $sched_sign));
     }
@@ -134,39 +181,21 @@ class Movie extends BaseController
     public function submitOrder()
     {
         $params = $this->request->params(
-            ['price', 0.00],
-            ['number', 0],
-            ['channel_type', ''],
-            ['pay_type', ''],
-            ['city_sign', ''],
-            ['city_name', ''],
-            ['area_code', ''],
-            ['area_name', ''],
-            ['cinema_sign', ''],
-            ['cinema_name', ''],
-            ['address', ''],
-            ['longitude', ''],
-            ['latitude', ''],
-            ['hall_sign', ''],
-            ['hall_name', ''],
-            ['relation_id', ''],
-            ['sched_sign', ''],
-            ['film_sign', ''],
-            ['film_name', ''],
-            ['show_date', ''],
-            ['show_time', ''],
-            ['sched_seat', '']
+            ['channel_type', 'P2'],
+            ['relation_id', ''], // 场次ID
+            ['sched_sign', ''], // 场次编码
+            ['seat_no', ''], // 座位
+            ['seat_sign', ''] // 座位编码
         );
 
-        if (empty($params['sched_sign'])) return app('json')->fail('请选择场次');
-        if (empty($params['seat_sign'])) return app('json')->fail('请选择座位');
-        if (empty($params['channel_type'])) return app('json')->fail('请选择购票类型');
+        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('请选择观影座位');
 
         $result = $this->repository->submitOrder($this->request->userInfo(), $params);
-        if ($result['code'] == 200) {
-            return app('json')->success($result);
+        if (!empty($result)) {
+            return app('json')->success(['order_sn' => $result]);
         } else {
-            return app('json')->fail($result);
+            return app('json')->fail('锁座下单失败');
         }
     }
 
@@ -177,8 +206,10 @@ class Movie extends BaseController
      */
     public function confirmOrder()
     {
-        $order_sn = $this->request->param(['order_sn']);
+        $order_sn = $this->request->param('order_sn', '');
         if (empty($order_sn)) return app('json')->fail('订单不存在');
+        $pay_type = $this->request->param('pay_type', '');
+        if (empty($pay_type)) return app('json')->fail('请选择支付方式');
 
         return app('json')->success($this->repository->confirmOrder($this->request->userInfo(), $order_sn));
     }

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);
-
         }
 
     }
@@ -311,14 +399,14 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_gongxian')->where($where)->where('status', 1)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_gongxian')->where($where)->where('status', 1)->where('number', '<>',0)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
 //        if($pm==1){
 //            $data = DB::name('user_sign_gongxian')->where($where)->where('pm', 2)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 //
 //        }
         if($pm==2){
-            $data = DB::name('user_sign_gongxian')->where($where)->where('status', -1)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_gongxian')->where($where)->where('number', '<>',0)->where('status', -1)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         log::info("=======date==={$data}");
@@ -2287,7 +2375,7 @@ return app("json")->success($data);
                 $paramStr = $userRepository->getTokenByCode($alinfo["authCode"], true);
 //                \think\facade\Db::name('log')->insert(['data'=>'支付宝授权信息'.json_encode($paramStr)]);
                 $nickname = empty($paramStr["nick_name"]) ? "al" . $alinfo["userId"] : $paramStr["nick_name"];
-                $avater = empty($paramStr["avatar"]) ? "http://app.bjtdba.com/uploads/def/20201118/5984361a2e00f5407776bcd6eaaae1ce.png" : $paramStr["avatar"];
+                $avater = empty($paramStr["avatar"]) ? "https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png" : $paramStr["avatar"];
             }
             $data2 = [
                 "type"     => $type,

app/controller/api/user/UserMp.php

@@ -36,8 +36,11 @@ class UserMp extends BaseController
         //点餐小程序
         // $this->appid = 'wx10669a2eca032216';
         // $this->secret = '0e71d5c636fdb9bf1c79c403db70f739';
-        $this->appid = 'wx7b4d857deb0447f3';
-        $this->secret = '643efbd7f3cd6398df1e7adb441afceb';
+//        $this->appid = 'wx7b4d857deb0447f3';
+//        $this->secret = '643efbd7f3cd6398df1e7adb441afceb';
+
+        $this->appid = 'wx9082e5ac2fdb513f';
+        $this->secret = 'e334c41e1c4aa962f65d1882092fbda6';
     }
 
     public function getUserUnionid(){
@@ -46,8 +49,10 @@ class UserMp extends BaseController
         if(!$data['code'] || $data['code'] == '' || $data['code'] =='undefined') {
             return app('json')->fail("异常操作");
         }
-        $appid = 'wx7b4d857deb0447f3';
-        $secret = '643efbd7f3cd6398df1e7adb441afceb';
+//        $appid = 'wx7b4d857deb0447f3';
+//        $secret = '643efbd7f3cd6398df1e7adb441afceb';
+        $appid = 'wx9082e5ac2fdb513f';
+        $secret = 'e334c41e1c4aa962f65d1882092fbda6';
         $url = "https://api.weixin.qq.com/sns/jscode2session?appid=".$appid."&secret=".$secret."&js_code=".$data['code']."&grant_type=authorization_code";
         $get = curlGet($url);
         if(!$get){
@@ -135,7 +140,7 @@ class UserMp extends BaseController
                     $unionData = [
                         'unionid' => $data['unionid'],
                         'nickname' => $data['nickname'] ? : time(),
-                        'avatar' => $data['avatar'] ? : 'http://app.bjtdba.com/uploads/def/20201118/5984361a2e00f5407776bcd6eaaae1ce.png',
+                        'avatar' => $data['avatar'] ? : 'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png',
                         'is_lock' => 1,
                         'lock_time' => date('Y-m-d H:i:s'),
                         'balance' => 0,
@@ -151,7 +156,7 @@ class UserMp extends BaseController
                     } else {
                         $updateData = [
                             'nickname' => $data['nickname'] ? : time(),
-                            'avatar' => $data['avatar'] ? : 'http://app.bjtdba.com/uploads/def/20201118/5984361a2e00f5407776bcd6eaaae1ce.png',
+                            'avatar' => $data['avatar'] ? : 'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png',
                             'update_time' => date('Y-m-d H:i:s')
                         ];
                         $unionUsersDao->update($unionUser->id, $updateData);

app/controller/merchant/Common.php

@@ -57,9 +57,14 @@ class Common extends BaseController
     {
         $merId = $this->merId;
 
-        $list['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $merId)->sum('number');
+        // $list['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $merId)->sum('number');
         $list['jingdou'] = Db::name('user_sign_jingdou')->where('mer_id', $merId)->sum('number');
+        $list['fenrunzhi'] = Db::name('order_merchant')->where('mer_id', $merId)->where('paid', 1)->sum('available');
     
+        $list['xianxia'] = Db::name('order_merchant')->where('mer_id', $merId)->where('paid', 1)->count();
+        $list['xianshang'] = Db::name('store_order')->where('mer_id', $merId)->where('paid', 1)->count();
+
+
         return app('json')->success(compact('merId', 'list'));
     }
 
@@ -83,8 +88,9 @@ class Common extends BaseController
         $list = $query->page($pageNum, $pageSize)->order('id desc')->where('mer_id', $merId)->where('paid', 1)->select();
         $list = $list->toArray();
         foreach ($list as $k => $v) {
-            $list[$k]['pv'] = Db::name('user_sign_gongxian')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('pv') ?? 0;
-            $list[$k]['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('number') ?? 0;
+            $list[$k]['pv'] = Db::name('user_sign_gongxian')->where('order_id', $v['id'])->value('pv') ?? 0;
+            // $list[$k]['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('number') ?? 0;
+            $list[$k]['fenrunzhi'] = $v['available'];
             $list[$k]['jingdou'] = Db::name('user_sign_jingdou')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('number') ?? 0;
         }
      

app/controller/merchant/store/shipping/ShippingTemplate.php

@@ -47,7 +47,9 @@ class ShippingTemplate extends BaseController
      */
     public function getList()
     {
-        return app('json')->success($this->repository->getList($this->request->merId()));
+//        return app('json')->success($this->repository->getList($this->request->merId()));
+        // 目前只包邮
+        return app('json')->success($this->repository->getList(0));
     }
 
     /**

app/view/index/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge" />
-    <title>储蓄保</title>
+    <title>幸福保</title>
     <link rel="stylesheet" href="index/css/all.min.css" />
     <link rel="stylesheet" href="index/css/slick.css">
     <link rel="stylesheet" href="index/css/slick-theme.css">
@@ -21,7 +21,7 @@
     <nav class="navbar navbar-expand-md tm-navbar" id="tmNav">
         <div class="container">
             <div class="tm-next">
-                <a href="#hero" class="navbar-brand">储蓄保</a>
+                <a href="#hero" class="navbar-brand">幸福保</a>
             </div>
 
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
@@ -46,7 +46,7 @@
 
     <div class="text-center tm-hero-text-container">
         <div class="tm-hero-text-container-inner">
-            <h2 class="tm-hero-title">储蓄保</h2>
+            <h2 class="tm-hero-title">幸福保</h2>
             <!-- <p class="tm-hero-subtitle">
                 Parallax Bootstrap Theme
                 <br />by TemplateMo
@@ -71,7 +71,7 @@
                 <div class="tm-intro-text-container">
                     <h2 class="tm-text-primary mb-4 tm-section-title">介绍</h2>
                     <p class="mb-4 tm-intro-text">
-						储蓄保让您轻松实现“互联网+养老”，专业可依赖的实力技术研发团队，成员分别来自移动互联网公司，通讯设计制造商、增值应用提供商、游戏设计公司，储蓄保APP致力于帮助百姓利用日常消费获取养老金，提升全国百姓养老、防老的生活品质；同时帮助商家引流，商家还可以用储蓄保移动互联网+广告，实现精准营销，高效获取目标客户，提高营业收入。
+						幸福保让您轻松实现“互联网+养老”，专业可依赖的实力技术研发团队，成员分别来自移动互联网公司，通讯设计制造商、增值应用提供商、游戏设计公司，幸福保APP致力于帮助百姓利用日常消费获取养老金，提升全国百姓养老、防老的生活品质；同时帮助商家引流，商家还可以用幸福保移动互联网+广告，实现精准营销，高效获取目标客户，提高营业收入。
                     </p>
                     <p class="mb-5 tm-intro-text">
 
@@ -204,13 +204,13 @@
                     <div class="tm-underline-inner"></div>
                 </div>
                 <p class="mb-5">
-					储蓄保让您轻松实现“互联网+养老”，专业可依赖的实力技术研发团队，成员分别来自移动互联网公司，通讯设计制造商、增值应用提供商、游戏设计公司，储蓄保APP致力于帮助百姓利用日常消费获取养老金，提升全国百姓养老、防老的生活品质；同时帮助商家引流，商家还可以用储蓄保移动互联网+广告，实现精准营销，高效获取目标客户，提高营业收入。
+					幸福保让您轻松实现“互联网+养老”，专业可依赖的实力技术研发团队，成员分别来自移动互联网公司，通讯设计制造商、增值应用提供商、游戏设计公司，幸福保APP致力于帮助百姓利用日常消费获取养老金，提升全国百姓养老、防老的生活品质；同时帮助商家引流，商家还可以用幸福保移动互联网+广告，实现精准营销，高效获取目标客户，提高营业收入。
 				</p>
         </div>
     </div>
     <a class="text-center small tm-footer gogoggg" href="http://www.beian.miit.gov.cn/" style="color: #fff;">
         <p class="mb-0">
-            京ICP备2020038339号-1
+            冀ICP备2025100336号-1
         </p>
     </a>
 </section>

config/console.php

@@ -22,6 +22,7 @@ return [
         'ln:import_user_cxb' => 'app\command\test\ln\ImportUser2',
 //        'great_life_order_independent_account' => 'app\command\GreatLifeOrderIndependentAccount',
 //        'commercial-\_area_order_independent_account' => 'app\command\CommercialAreaOrderIndependentAccount',
+        // 'huafei_order_independent_account' => 'app\command\HuafeiOrderIndependentAccount',
         'movie_city_area' => 'app\command\MovieCityAreaCommand',
         'movie_cinema' => 'app\command\MovieCinemaCommand',
         'movie_film' => 'app\command\MovieFilmCommand',

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();
             }
         });
     }

route/admin.php

@@ -86,6 +86,12 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::delete('delete/:id', '/delete')->name('configSettingDelete');
             Route::post('upload_file/:field', '/upload')->name('configUpload');
         })->prefix('admin.system.config.Config');
+        //用户身份升级配置
+        Route::group('config/identity', function () {
+            Route::post('update/:id', '/update')->name('configIdentityUpdate');
+            Route::get('update/table/:id', '/updateTable')->name('configIdentityUpdateForm');
+            Route::get('lst', '/lst')->name('configIdentityLst');
+        })->prefix('admin.system.config.Identity');
 
         Route::group('config/others', function () {
             Route::get('lst', 'ConfigOthers/lst')->name('configOthersSettingLst');

route/api.php

@@ -1271,12 +1271,14 @@ Route::group('api/', function () {
 
     //电影
     Route::group('movie', function () {
-        Route::get('city', '/getMovieCity');
-        Route::get('area', '/getArea');
-        Route::get('cinema', '/getCinema');
-        Route::get('film', '/getFilm');
-        Route::get('cinema_sched', '/getCinemaSched');
-        Route::get('sched_seat', '/getSchedSeat');
+        Route::get('city', '/getMovieCity'); // 城市列表
+        Route::get('area', '/getArea'); // 城区列表
+        Route::get('cinema', '/getCinema'); // 影院列表
+        Route::get('film', '/getFilm'); // 影片列表
+        Route::get('filmsched_date', '/getFilmSchedDate'); // 影片场次日期
+        Route::get('film_sched', '/getFilmSched'); // 根据影片排片日期查询排片影院
+        Route::get('cinemafilm_sched', '/getCinemaFilmSched'); // 根据影院影片场次日期查询场次列表
+        Route::get('sched_seat', '/getSchedSeat'); // 获取场次座位
     })->prefix('api.movie.Movie');
 
     //电影 - 下单业务