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

app/common/model/movie/cinema/CinemaSched.php

@@ -28,10 +28,14 @@ class CinemaSched extends BaseModel
             $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['date']) && $where['date'], function ($query) use ($where) {
+            $query->where('show_date', '>=', $where['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']);
+        })->when(isset($where['show_time']) && $where['show_time'], function ($query) use ($where) {
+            $query->where('show_time', '>=', $where['show_time']);
         });
     }
 }

app/common/repositories/movie/CinemaSchedRepository.php

@@ -40,7 +40,7 @@ class CinemaSchedRepository extends BaseRepository
     public function getFilmSchedDate($film_sign)
     {
         $field = 'show_date';
-        $where = [['film_sign', '=', $film_sign], ['show_date', '>=', strtotime(date('Y-m-d'))]];
+        $where = ['film_sign' => $film_sign, 'date' => strtotime(date('Y-m-d'))];
 
         $show_date = $this->dao->search(null, $where)->field([$field])->order('show_date asc')->group('show_date')->select()->toArray();
         foreach ($show_date as $key => $value) {
@@ -63,10 +63,10 @@ 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, $with = [], $order = 1)
+    public function getFilmSched($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];
+        $where = ['film_sign' => $film_sign, 'show_date' => $show_date, 'show_time' => $show_time];
 
         $cinema_sched = $this->dao->search(null, $where)->when($with, function ($query) use ($with) {
             $query->with($with);

app/controller/api/movie/Movie.php

@@ -131,7 +131,7 @@ class Movie extends BaseController
 
         /** @var CinemaSchedRepository $cinemaSchedRepository */
         $cinemaSchedRepository = app()->make(CinemaSchedRepository::class);
-        return app('json')->success($cinemaSchedRepository->getFilmSched($page, $limit, $film_sign, $longitude, $latitude, $show_date));
+        return app('json')->success($cinemaSchedRepository->getFilmSched($page, $limit, $film_sign, $longitude, $latitude, $show_date, date('H:i')));
     }
 
     /**