1、调整锁座

2、确认订单，发起支付

app/common/repositories/movie/MovieRepository.php

@@ -128,14 +128,21 @@ class MovieRepository extends BaseRepository
         foreach ($schedSeatList as $key => $value) {
             $tmpprice = [];
             foreach ($value['price'] as $pKey => $pValue) {
-                $tmpprice[$pValue] = ['channel_type' => $pKey, 'price' => $pValue];
+                $tmpprice[$pKey] = ['channel_type' => $pKey, 'price' => $pValue];
+            }
+
+            $channel_price = [];
+            if (isset($tmpprice['P2'])) {
+                $channel_price = $tmpprice['P2'];
+            } elseif (isset($tmpprice['P1'])) {
+                $channel_price = $tmpprice['P1'];
+            } elseif (isset($tmpprice['P0'])) {
+                $channel_price = $tmpprice['P0'];
             }
-            ksort($tmpprice);
-            $tmpprice = array_shift($tmpprice);
             unset($schedSeatList[$key]['price']);
 
-            $pcYanglaojinGongxian = self::getPvYanglaojinScore($tmpprice['price']);
-            $schedSeatList[$key]['channel_type'] = $tmpprice['channel_type'];
+            $pcYanglaojinGongxian = self::getPvYanglaojinScore($channel_price['price']);
+            $schedSeatList[$key]['channel_sn'] = base64_encode(json_encode($channel_price, JSON_FORCE_OBJECT));
             $schedSeatList[$key]['price'] = $pcYanglaojinGongxian['cost_price'];
             $schedSeatList[$key]['yanglaojin'] = $pcYanglaojinGongxian['yanglaojin'];
             $schedSeatList[$key]['pv'] = $pcYanglaojinGongxian['pv'];
@@ -172,9 +179,17 @@ class MovieRepository extends BaseRepository
         $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 = bcmul((string)$sched['cost_price'], (string)count($seat_sign), 2);
-        $submitOrder = DouHuoMallFilmApiRequest::submitOrder($userinfo->phone, $params['channel_type'], $params['sched_sign'], $seat_sign, $order_sn, $order_price);
+        $channel_sn = json_decode(base64_decode($params['channel_sn']), true);
+        if (empty($channel_sn) || !isset($channel_sn['channel_type']) || empty($channel_sn['channel_type']) || !isset($channel_sn['price'])
+            || empty($channel_sn['price']) || json_last_error()) {
+            throw new ValidateException('请选择观影场次');
+        }
+
+        $sched_seat = json_decode($params['sched_seat'], true);
+        if (json_last_error()) throw new ValidateException('锁座下单失败');
+
+        $order_price = bcmul((string)$channel_sn['price'], (string)count($sched_seat), 2);
+        $submitOrder = DouHuoMallFilmApiRequest::submitOrder($userinfo->phone, $channel_sn['channel_type'], $params['sched_sign'], array_column($sched_seat, '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);
@@ -185,10 +200,10 @@ class MovieRepository extends BaseRepository
                 'mobile' => $userinfo->phone,
                 'order_sn' => $order_sn,
                 'plat_order' => $submitOrder['data']['plat_order'],
-                'price' => $sched['price'],
-                'number' => count($seat_sign),
-                'order_price' => $order_price,
-                'channel_type' => $params['channel_type'],
+                'price' => $channel_sn['price'],
+                'number' => count($sched_seat),
+                'order_price' => bcadd((string)$order_price, bcmul((string)$order_price, (string)self::premium_ratio, 2), 2),
+                'channel_type' => $channel_sn['channel_type'],
                 'city_sign' => $cinema['city_sign'],
                 'city_name' => $cinema['city_name'],
                 'area_code' => $cinema['area_sign'],
@@ -206,10 +221,9 @@ class MovieRepository extends BaseRepository
                 'film_name' => $sched['film_name'],
                 'show_date' => $sched['show_date'],
                 'show_time' => $sched['show_time'],
-                'sched_seat' => $sched['sched_seat'],
+                'sched_seat' => $params['sched_seat'], // 场次座位
                 'create_time' => time()
             ];
-
             $order_sn = Db::transaction(function () use ($userinfo, $_order) {
                 $_order = $this->dao->create($_order);
                 if ($_order) return $_order['order_sn'];
@@ -224,9 +238,13 @@ class MovieRepository extends BaseRepository
     /**
      * @param $userinfo
      * @param $order_sn
-     * @return mixed|string
+     * @param $pay_type
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
-    public function confirmOrder($userinfo, $order_sn)
+    public function confirmOrder($userinfo, $order_sn, $pay_type)
     {
         $orderinfo = $this->dao->getWhere(['order_sn' => $order_sn, 'uid' => $userinfo->uid])->find();
         if (empty($orderinfo)) throw new ValidateException('订单不存在');
@@ -234,10 +252,19 @@ class MovieRepository extends BaseRepository
         if ($orderinfo['paid'] == 0 && $orderinfo['status'] == 3) throw new ValidateException('订单已取消');
         if ($orderinfo['paid'] == 1) throw new ValidateException('订单已支付');
 
-//                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($orderinfo['order_sn'], $orderinfo['order_price']);
+        $res = $this->pay($pay_type, $userinfo->wechat_user_id, $orderinfo, $orderinfo['film_name'], env('APP_URL') . "/api/hf_notify/movie", 'delay');
+        Db::name('log')->insert(['data' => '汇付电影票订单支付--- 返回参数' . json_encode($res)]);
+        if (isset($res['id'])) {
+            $type = 0;
+            if ($pay_type == 'wx') $type = 2;
+            if (strtolower($pay_type) == 'ali') $type = 1;
+            $orderinfo->pay_type = $type;
+            $orderinfo->save();
+
+            return app('json')->success($res);
+        }
+        throw new ValidateException('支付失败');
+//        return DouHuoMallFilmApiRequest::confirmOrder($orderinfo['order_sn'], $orderinfo['order_price']);
     }
 
     /**
@@ -289,6 +316,7 @@ class MovieRepository extends BaseRepository
                 ];
                 break;
             case 'ALI':
+            case 'ali':
                 $type = '1';
                 // 天地博爱科技通道
                 $app_id = 'app_44108546-d27a-48ee-88c1-84b45b75114f';

app/controller/api/movie/Movie.php

@@ -166,7 +166,6 @@ class Movie extends BaseController
     {
         $relation_id = $this->request->param('relation_id', '');
         if (empty($relation_id)) return app('json')->fail('请选择观影场次');
-
         $sched_sign = $this->request->param('sched_sign', '');
         if (empty($sched_sign)) return app('json')->fail('请选择观影场次');
 
@@ -181,14 +180,14 @@ class Movie extends BaseController
     public function submitOrder()
     {
         $params = $this->request->params(
-            ['channel_type', 'P2'],
             ['relation_id', ''], // 场次ID
             ['sched_sign', ''], // 场次编码
             ['seat_no', ''], // 座位
-            ['seat_sign', ''] // 座位编码
+            ['seat_sign', ''], // 座位编码
+            ['channel_sn', ''] // 实际价格
         );
 
-        if (empty($params['relation_id']) || empty($params['sched_sign'])) return app('json')->fail('请选择观影场次');
+        if (empty($params['relation_id']) || empty($params['sched_sign']) || $params['channel_sn']) 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);
@@ -209,9 +208,9 @@ class Movie extends BaseController
         $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('请选择支付方式');
+        if (empty($pay_type) || !in_array($pay_type, ['wx', 'ali'])) return app('json')->fail('请选择支付方式');
 
-        return app('json')->success($this->repository->confirmOrder($this->request->userInfo(), $order_sn));
+        return app('json')->success($this->repository->confirmOrder($this->request->userInfo(), $order_sn, $pay_type));
     }
 
     /**