Merge branch 'master' of https://git.bjtdba.com/shop/php

app/common/repositories/movie/MovieRepository.php

@@ -176,9 +176,9 @@ class MovieRepository extends BaseRepository
         $order_sn = substr($storeOrder->getNewOrderId(), 0, 20);
 
         /** @var CinemaSchedRepository $cinemaSchedRepository */
-        $cinemaSchedRepository = app()->make(CinemaSchedRepository::class);
-        $sched = $cinemaSchedRepository->getCinemaSchedInfo($params['relation_id'], $params['sched_sign']);
-        if (empty($sched)) throw new ValidateException('观影场次不存在');
+//        $cinemaSchedRepository = app()->make(CinemaSchedRepository::class);
+//        $sched = $cinemaSchedRepository->getCinemaSchedInfo($params['relation_id'], $params['sched_sign']);
+//        if (empty($sched)) throw new ValidateException('观影场次不存在');
 
         $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'])
@@ -194,7 +194,11 @@ class MovieRepository extends BaseRepository
         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']);
+            $cinema = $cinemaRepository->getCinemaInfo($params['cinema_sign']);
+
+            /** @var FilmRepository $filmRepository */
+            $filmRepository = app()->make(FilmRepository::class);
+            $filminfo = $filmRepository->getFilmInfo($params['film_sign']);
 
             $_order = [
                 'uid' => $userinfo->uid,
@@ -214,14 +218,14 @@ class MovieRepository extends BaseRepository
                 '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'],
+                'hall_sign' => $params['hall_sign'],
+                'hall_name' => $params['hall_name'],
+                'relation_id' => $params['relation_id'],
+                'sched_sign' => $params['sched_sign'],
+                'film_sign' => $filminfo['film_sign'],
+                'film_name' => $filminfo['film_name'],
+                'show_date' => $params['show_date'],
+                'show_time' => $params['show_time'],
                 'sched_seat' => $params['sched_seat'], // 场次座位
                 'create_time' => time()
             ];

app/controller/api/movie/Movie.php

@@ -186,10 +186,19 @@ class Movie extends BaseController
     {
         $params['relation_id'] = $this->request->param('relation_id', '');// 场次ID
         $params['sched_sign'] = $this->request->param('sched_sign', '');// 场次编码
-        $params['sched_seat'] = $this->request->param('sched_seat', '');// 座位编码
         $params['channel_sn'] = $this->request->param('channel_sn', '');// 实际价格
+        $params['sched_seat'] = $this->request->param('sched_seat', '');// 座位编码
+        $params['hall_sign'] = $this->request->param('hall_sign', '');// 影厅编码
+        $params['hall_name'] = $this->request->param('hall_name', '');// 影厅名称
+        $params['show_date'] = $this->request->param('show_date', '');// 观影日期
+        $params['show_time'] = $this->request->param('show_time', '');// 观影时间
+        $params['film_sign'] = $this->request->param('film_sign', '');// 影片编码
+        $params['cinema_sign'] = $this->request->param('cinema_sign', '');// 影院编码
         $params['phone'] = $this->request->param('phone', '');// 联系电话
 
+        if (empty($params['cinema_sign']) || empty($params['hall_sign']) || empty($params['hall_name'])) return app('json')->fail('请选择观影影院');
+        if (empty($params['film_sign'])) return app('json')->fail('请选择观影影片');
+        if (empty($params['show_date']) || empty($params['show_time'])) return app('json')->fail('请选择观影时间');
         if (empty($params['relation_id']) || empty($params['sched_sign']) || empty($params['channel_sn'])) return app('json')->fail('请选择观影场次');
         if (empty($params['sched_seat'])) return app('json')->fail('请选择观影座位');