Merge branch 'master' 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)
@@ -56,9 +57,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 +70,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

@@ -473,7 +473,7 @@ class PensionTasks extends Command
             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]);
@@ -484,10 +484,10 @@ class PensionTasks extends Command
                 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) {
                 //新增入账明细记录

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/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,45 @@ 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']['list'] : [];
+        foreach ($schedSeatList as $key => $value) {
+            $tmpprice = json_decode($value['price'], true);
+            if (isset($tmpprice['P2'])) {
+                $price = $tmpprice['P2'];
+            } elseif (isset($tmpprice['P1'])) {
+                $price = $tmpprice['P1'];
+            } elseif (isset($tmpprice['P0'])) {
+                $price = $tmpprice['P0'];
+            } else {
+                $price = 0.00;
+            }
+            unset($schedSeatList[$key]['price']);
+
+            $pcYanglaojinGongxian = self::getPvYanglaojinScore($price);
+            $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 +167,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 +237,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 +350,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,
@@ -9553,7 +9546,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 +9658,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 +9684,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 +9713,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 +9767,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 +9882,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);
@@ -9917,7 +9909,7 @@ class StoreOrderRepository extends BaseRepository
                     $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->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 +9930,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 +10001,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']);
                 }
 
             }
@@ -10555,6 +10547,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 +10633,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/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;

app/controller/api/Notify.php

@@ -178,7 +178,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,9 +291,9 @@ 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);
                                         }
 
                                         //普通用户推广人
@@ -318,7 +318,7 @@ 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->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->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送积分");
 
@@ -352,7 +352,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 +410,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 +531,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);
 
@@ -565,7 +565,7 @@ class Notify
                                         $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->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 +591,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 +636,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']);
                                     }
 
                                 }

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

@@ -311,14 +311,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 +2287,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

@@ -135,7 +135,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 +151,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/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',

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');
 
     //电影 - 下单业务