app/common/dao/movie/order/MovieOrderDao.php

@@ -62,6 +62,12 @@ class MovieOrderDao extends BaseDao
             })
             ->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
                 $query->where('paid', $where['paid']);
+            })
+            ->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/movie/MovieRepository.php

@@ -139,6 +139,19 @@ class MovieRepository extends BaseRepository
     {
         $result = DouHuoMallFilmApiRequest::getSchedSeat($relation_id, $sched_sign);
 
+        $sched_seatList = [];
+        // 根据场次id、场次编号获取锁座订单
+        $seatOrder = $this->dao->search(['relation_id' => $relation_id, 'sched_sign' => $sched_sign, 'status' => [0, 1]])->field('relation_id,sched_sign,sched_seat')->select()->toArray();
+        if (!empty($seatOrder)) {
+            $tmpsched_seat = array_column($seatOrder, 'sched_seat');
+            foreach ($tmpsched_seat as $ssKey => $ssValue) {
+                $ssValue = json_decode($ssValue, true);
+                foreach ($ssValue as $k => $v) {
+                    $sched_seatList[$v['seat_sign']] = $v['seat_sign'];
+                }
+            }
+        }
+
         $seat = [];
         $schedSeatList = (isset($result['code']) && ($result['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) ? $result['data'] : [];
         foreach ($schedSeatList as $key => $value) {
@@ -166,6 +179,9 @@ class MovieRepository extends BaseRepository
             $schedSeatList[$key]['gongxian'] = $pcYanglaojinGongxian['gongxian'];
             $schedSeatList[$key]['relation_id'] = $relation_id; // 场次ID
             $schedSeatList[$key]['sched_sign'] = $sched_sign; // 场次编码
+            if ($value['status'] == 1) {
+                $schedSeatList[$key]['status'] = isset($sched_seatList[$value['seatSign']]) ? 0 : 1;
+            }
 
             $seat[$value['rowNo']][] = $schedSeatList[$key];
         }
@@ -200,6 +216,9 @@ class MovieRepository extends BaseRepository
         if (json_last_error()) throw new ValidateException('锁座下单失败');
 
         $order_price = bcmul((string)$channel_sn['price'], (string)count($sched_seat), 2);
+        Db::name('log')->insert(['data' => '---电影票支付订单数据---' . json_encode([
+                $params['phone'] ?? $userinfo->phone, $channel_sn['channel_type'], $params['sched_sign'], array_column($sched_seat, 'seat_sign'), $order_sn, $order_price
+            ])]);
         $submitOrder = DouHuoMallFilmApiRequest::submitOrder($params['phone'] ?? $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 */