调整接口：根据影片-获取影院列表

app/common/repositories/movie/CinemaSchedRepository.php

@@ -9,6 +9,7 @@ namespace app\common\repositories\movie;
 
 use app\common\model\movie\cinema\CinemaSched;
 use app\common\repositories\BaseRepository;
+use crmeb\services\ApiResponseService;
 use think\facade\Db;
 
 /**
@@ -63,7 +64,35 @@ class CinemaSchedRepository extends BaseRepository
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getFilmSched($page, $limit, $film_sign, $longitude, $latitude, $show_date, $show_time, $with = [], $order = 1)
+    public function getFilmSched($page, $limit, $film_sign, $longitude, $latitude, $city_sign)
+    {
+        /** @var MovieRepository $movieRepository */
+        $movieRepository = app()->make(MovieRepository::class);
+        $result = $movieRepository->getFilmSched($page, $limit, $film_sign, $longitude, $latitude, $city_sign);
+        $cinema_sched = (isset($result['code']) && ($result['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE))
+            ? $result['data']['list'] : [];
+        $count = (isset($result['code']) && ($result['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE))
+            ? $result['data']['paging']['total'] : 0;
+        $pages = (isset($result['code']) && ($result['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE))
+            ? $result['data']['paging']['pages'] : 0;
+
+        return compact('cinema_sched', 'count', 'pages');
+    }
+
+    /**
+     * @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 getFilmSchedBak($page, $limit, $film_sign, $longitude, $latitude, $show_date, $show_time, $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];

app/common/repositories/movie/DouHuoMallFilmApiRequest.php

@@ -144,7 +144,7 @@ class DouHuoMallFilmApiRequest
      * @param $film_sign
      * @return mixed|string
      */
-    public static function getFilmSched($page = 1, $limit = 10, $film_sign = '', $longitude = '', $latitude = '')
+    public static function getFilmSched($page = 1, $limit = 10, $film_sign = '', $longitude = '', $latitude = '', $city_sign = '')
     {
         $url = '/openapi/Movie/getFilmSched';
         $body = [
@@ -153,7 +153,8 @@ class DouHuoMallFilmApiRequest
             'limit' => $limit,
             'film_sign' => $film_sign,
             'longitude' => $longitude,
-            'latitude' => $latitude
+            'latitude' => $latitude,
+            'city_sign' => $city_sign
         ];
 
         $res = self::curl_post(self::$path . $url, $body);

app/common/repositories/movie/MovieRepository.php

@@ -116,6 +116,20 @@ class MovieRepository extends BaseRepository
     }
 
     /**
+     * @param $page
+     * @param $limit
+     * @param $film_sign
+     * @param $longitude
+     * @param $latitude
+     * @param $city_sign
+     * @return mixed|string
+     */
+    public function getFilmSched($page = 1, $limit = 10, $film_sign = '', $longitude = '', $latitude = '', $city_sign = '')
+    {
+        return DouHuoMallFilmApiRequest::getFilmSched($page, $limit, $film_sign, $longitude, $latitude, $city_sign);
+    }
+
+    /**
      * @param $relation_id
      * @param $sched_sign
      * @return mixed|string

app/controller/api/movie/Movie.php

@@ -113,7 +113,7 @@ class Movie extends BaseController
     }
 
     /**
-     * 根据影片、排片日期-获取影院列表
+     * 根据影片-获取影院列表
      *
      * @return mixed
      */
@@ -123,15 +123,15 @@ class Movie extends BaseController
         $film_sign = $this->request->param('film_sign', '');
         $longitude = $this->request->param('longitude', '');// 经度
         $latitude = $this->request->param('latitude', '');// 纬度
-        $show_date = $this->request->param('show_date', '');
+        $city_sign = $this->request->param('city_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('请选择观影日期');
+        if (empty($city_sign)) 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, date('H:i')));
+        return app('json')->success($cinemaSchedRepository->getFilmSched($page, $limit, $film_sign, $longitude, $latitude, $city_sign));
     }
 
     /**

route/api.php

@@ -1281,7 +1281,7 @@ Route::group('api/', function () {
         Route::get('cinema', '/getCinema'); // 影院列表
         Route::get('film', '/getFilm'); // 影片列表
         Route::get('filmsched_date', '/getFilmSchedDate'); // 影片场次日期
-        Route::get('film_sched', '/getFilmSched'); // 根据影片排片日期查询排片影院
+        Route::get('film_sched', '/getFilmSched'); // 根据影片查询排片影院
         Route::get('cinemafilm_sched', '/getCinemaFilmSched'); // 根据影院影片场次日期查询场次列表
         Route::get('sched_seat', '/getSchedSeat'); // 获取场次座位
     })->prefix('api.movie.Movie');