电影模块

app/command/MovieCinemaCommand.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace app\command;
+
+use app\common\repositories\movie\CinemaRepository;
+use app\common\repositories\movie\MovieRepository;
+use crmeb\services\ApiResponseService;
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\facade\Db;
+
+class MovieCinemaCommand extends Command
+{
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('movie-cinema')->setDescription('电影-获取影院列表');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $this->doMovieCinema();
+    }
+
+    /**
+     * 电影-获取影院列表
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    private function doMovieCinema()
+    {
+        $page = 1;
+        $limit = 100;
+
+        /** @var MovieRepository $movieRepository */
+        $movieRepository = app()->make(MovieRepository::class);
+        $cinemaLists = $movieRepository->getCinema($page, $limit);
+
+        if (isset($cinemaLists['code']) && ($cinemaLists['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) {
+            $this->createMovieCinema($cinemaLists['data']['list']);
+
+            $data = $cinemaLists['data'];
+            $totalPages = $data['paging']['pages'] ?? 0;
+            for ($index = ($page + 1); $index <= $totalPages; $index++) {
+                $cinemaLists = $movieRepository->getCinema($index, $limit);
+                if (isset($cinemaLists['code']) && ($cinemaLists['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) {
+                    $this->createMovieCinema($cinemaLists['data']['list']);
+                    sleep(1);
+                }
+            }
+        }
+    }
+
+    /**
+     * 电影-影院列表
+     *
+     * @param $list
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    private function createMovieCinema($list)
+    {
+        $cinema_signList = array_column($list, 'cinema_sign');
+
+        $localCinema_nameLists = Db::name('movie_cinema')->whereIn('cinema_sign', $cinema_signList)->field('id,cinema_sign,cinema_name,address,tel')->select();
+        $localCinema_nameLists = !empty($localCinema_nameLists) ? array_reduce($localCinema_nameLists->toArray(), function ($carry, $item) {
+            $carry[$item['cinema_sign']] = [
+                'id' => $item['id'], 'cinema_sign' => $item['cinema_sign'], 'cinema_name' => $item['cinema_name'],
+                'address' => $item['address'], 'tel' => $item['tel']
+            ];
+            return $carry;
+        }, []) : [];
+
+        foreach ($list as $key => $value) {
+            $params = [
+                'cinema_sign' => $value['cinema_sign'],
+                'cinema_name' => $value['cinema_name'],
+                'address' => $value['address'],
+                'tel' => trim($value['tel']),
+                'longitude' => $value['longitude'],
+                'latitude' => $value['latitude'],
+                'city_sign' => $value['city_sign'],
+                'city_name' => $value['city_name'],
+                'area_sign' => $value['area_sign'],
+                'area_name' => $value['area_name']
+            ];
+            if (!isset($localCinema_nameLists[$value['cinema_sign']])) {
+                $params['create_time'] = time();
+                Db::name('movie_cinema')->insert($params);
+            } else {
+                $localCinema_name = $localCinema_nameLists[$value['cinema_sign']];
+                if (md5($value['cinema_sign'] . $value['cinema_name'] . $value['address'] . $value['tel'])
+                    != md5($localCinema_name['cinema_sign'] . $localCinema_name['cinema_name'] . $localCinema_name['address'] . $localCinema_name['tel'])) {
+                    $params['update_time'] = time();
+                    Db::name('movie_cinema')->where('id', $localCinema_name['id'])->update($params);
+                }
+            }
+        }
+    }
+}

app/command/MovieCityAreaCommand.php

@@ -0,0 +1,135 @@
+<?php
+
+namespace app\command;
+
+use app\common\repositories\movie\MovieRepository;
+use crmeb\services\ApiResponseService;
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\facade\Db;
+
+class MovieCityAreaCommand extends Command
+{
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('movie-city-area')->setDescription('电影-城市列表');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $this->doMovieCity();
+        $this->doMovieCityArea();
+    }
+
+    /**
+     * 电影-城市-分区列表
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    private function doMovieCity()
+    {
+        $page = 1;
+        $limit = 100;
+
+        /** @var MovieRepository $movieRepository */
+        $movieRepository = app()->make(MovieRepository::class);
+        $movieCityLists = $movieRepository->getMovieCity($page, $limit);
+
+        if (isset($movieCityLists['code']) && ($movieCityLists['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) {
+            $this->createMovieCity($movieCityLists['data']['list']);
+
+            $data = $movieCityLists['data'];
+            $totalPages = $data['paging']['pages'] ?? 0;
+            for ($index = ($page + 1); $index <= $totalPages; $index++) {
+                $movieCityLists = $movieRepository->getMovieCity($index, $limit);
+                if (isset($movieCityLists['code']) && ($movieCityLists['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) {
+                    $this->createMovieCity($movieCityLists['data']['list']);
+                    sleep(1);
+                }
+            }
+        }
+    }
+
+    /**
+     * 电影-城市列表
+     *
+     * @param $list
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    private function createMovieCity($list)
+    {
+        $city_signList = array_column($list, 'city_sign');
+
+        $localCityLists = Db::name('movie_city')->whereIn('city_sign', $city_signList)->field('id,city_sign,city_name')->select();
+        $localCityLists = !empty($localCityLists) ? array_reduce($localCityLists->toArray(), function ($carry, $item) {
+            $carry[$item['city_sign']] = ['id' => $item['id'], 'city_sign' => $item['city_sign'], 'city_name' => $item['city_name']];
+            return $carry;
+        }, []) : [];
+
+        foreach ($list as $key => $value) {
+            $params = [
+                'city_sign' => $value['city_sign'],
+                'city_name' => $value['city_name'],
+                'initial' => $value['initial'],
+            ];
+            if (!isset($localCityLists[$value['city_sign']])) {
+                $params['create_time'] = time();
+                Db::name('movie_city')->insert($params);
+            } else {
+                if (md5($value['city_sign'] . $value['city_name']) != md5($localCityLists[$value['city_sign']]['city_name'])) {
+                    $params['update_time'] = time();
+                    Db::name('movie_city')->where('id', $localCityLists[$value['city_sign']]['id'])->update($params);
+                }
+            }
+        }
+    }
+
+    /**
+     * 电影-城市分区列表
+     *
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    private function doMovieCityArea()
+    {
+        /** @var MovieRepository $movieRepository */
+        $movieRepository = app()->make(MovieRepository::class);
+
+        $localCityLists = Db::name('movie_city')->field('id,city_sign,city_name')->select();
+        foreach ($localCityLists as $key => $value) {
+            $movieAreaLists = $movieRepository->getMovieArea($value['city_sign']);
+            if (isset($movieAreaLists['code']) && ($movieAreaLists['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE) && !empty($movieAreaLists['data']['list'])) {
+                foreach ($movieAreaLists['data']['list'] as $maKey => $maValue) {
+                    $params = [
+                        'parent_id' => $value['id'],
+                        'city_sign' => $value['city_sign'],
+                        'city_name' => $value['city_name'],
+                        'area_code' => $maValue['area_code'],
+                        'area_name' => $maValue['area_name']
+                    ];
+                    $city_area = Db::name('movie_city_area')->where(['parent_id' => $value['id'], 'city_sign' => $value['city_sign'], 'area_code' => $maValue['area_code']])->find();
+                    if (empty($city_area)) {
+                        $params['create_time'] = time();
+                        Db::name('movie_city_area')->insert($params);
+                    } else {
+                        if (md5($maValue['area_code'] . $maValue['area_name']) != md5($city_area['area_code'] . $city_area['area_name'])) {
+                            $params['update_time'] = time();
+                            Db::name('movie_city_area')->where('id', $city_area['id'])->update($params);
+                        }
+                    }
+                }
+                sleep(1);
+            }
+        }
+    }
+
+}

app/command/MovieFilmCommand.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace app\command;
+
+use app\common\repositories\movie\MovieRepository;
+use crmeb\services\ApiResponseService;
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\facade\Db;
+
+class MovieFilmCommand extends Command
+{
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('movie-film')->setDescription('电影-获取影片列表');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $this->doMovieFilm();
+    }
+
+    /**
+     * 电影-获取影片列表
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    private function doMovieFilm()
+    {
+        $page = 1;
+        $limit = 50;
+
+        /** @var MovieRepository $movieRepository */
+        $movieRepository = app()->make(MovieRepository::class);
+        $filmLists = $movieRepository->getFilm($page, $limit);
+
+        if (isset($filmLists['code']) && ($filmLists['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) {
+            $this->createMovieFilm($filmLists['data']['list']);
+
+            $data = $filmLists['data'];
+            $totalPages = $data['paging']['pages'] ?? 0;
+            for ($index = ($page + 1); $index <= $totalPages; $index++) {
+                $filmLists = $movieRepository->getFilm($index, $limit);
+                if (isset($filmLists['code']) && ($filmLists['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) {
+                    $this->createMovieFilm($filmLists['data']['list']);
+                    sleep(1);
+                }
+            }
+        }
+    }
+
+    /**
+     * 电影-获取影片列表
+     *
+     * @param $list
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    private function createMovieFilm($list)
+    {
+        $film_signList = array_column($list, 'film_sign');
+
+        $localFilm_nameLists = Db::name('movie_film')->whereIn('film_sign', $film_signList)->field('id,film_sign,film_name,publish_date')->select();
+        $localFilm_nameLists = !empty($localFilm_nameLists) ? array_reduce($localFilm_nameLists->toArray(), function ($carry, $item) {
+            $carry[$item['film_sign']] = [
+                'id' => $item['id'], 'film_sign' => $item['film_sign'], 'film_name' => $item['film_name'], 'publish_date' => $item['publish_date']
+            ];
+            return $carry;
+        }, []) : [];
+
+        foreach ($list as $key => $value) {
+            $params = [
+                'film_sign' => $value['film_sign'],
+                'film_name' => $value['film_name'],
+                'publish_date' => strtotime($value['publish_date']),
+                'language' => trim($value['language']),
+                'type' => $value['type'],
+                'duration' => $value['duration'],
+                'version' => $value['version'],
+                'grade' => $value['grade'],
+                'hots' => $value['hots'],
+                'cover_img' => $value['cover_img'],
+                'video' => $value['video'],
+                'detail_img' => json_encode($value['detail_img'], JSON_FORCE_OBJECT),
+                'director' => json_encode($value['director'], JSON_FORCE_OBJECT),
+                'actors' => json_encode($value['actors'], JSON_FORCE_OBJECT),
+                'intro' => $value['intro']
+            ];
+            if (!isset($localFilm_nameLists[$value['film_sign']])) {
+                $params['create_time'] = time();
+                Db::name('movie_film')->insert($params);
+            } else {
+                $localFilm_name = $localFilm_nameLists[$value['film_sign']];
+                if (md5($value['film_sign'] . $value['film_name'] . $value['publish_date'])
+                    != md5($localFilm_name['film_sign'] . $localFilm_name['film_name'] . $localFilm_name['publish_date'])) {
+                    $params['update_time'] = time();
+                    Db::name('movie_film')->where('id', $localFilm_name['id'])->update($params);
+                }
+            }
+        }
+    }
+}

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

@@ -44,7 +44,6 @@ class MovieOrderDao extends BaseDao
      */
     public function search(array $where, $sysDel = 0)
     {
-
         return MovieOrder::getDB()
             ->when(($sysDel !== null), function ($query) use ($sysDel) {
                 $query->where('is_system_del', $sysDel);

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

@@ -0,0 +1,35 @@
+<?php
+
+namespace app\common\model\movie\cinema;
+
+use app\model\BaseModel;
+
+class Cinema extends BaseModel
+{
+    protected $name = 'movie_cinema';
+
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    /**
+     * @param $model
+     * @param array $where
+     * @return Cinema
+     */
+    public function search($model = null, array $where = [])
+    {
+        $model = $model ?? new self();
+
+        return $model->when(isset($where['cinema_name']) && $where['cinema_name'], function ($query) use ($where) {
+            $query->where('cinema_name', 'like', "%{$where['cinema_name']}%");
+        })->when(isset($where['cate_one_id']) && $where['cate_one_id'], function ($query) use ($where) {
+            $query->where('cate_one_id', $where['cate_one_id']);
+        })->when(isset($where['cate_two_id']) && $where['cate_two_id'], function ($query) use ($where) {
+            $query->where('cate_two_id', $where['cate_two_id']);
+        })->when(isset($where['city']) && $where['city'], function ($query) use ($where) {
+            $query->where('city', 'like', "%{$where['city']}%");
+        });
+    }
+}

app/common/model/movie/city/City.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020/6/1
+ *
+ *
+ */
+
+namespace app\common\model\movie\city;
+
+
+use app\common\model\BaseModel;
+
+class City extends BaseModel
+{
+
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'movie_city';
+    }
+}

app/common/model/movie/film/Film.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace app\common\model\movie\film;
+
+use app\model\BaseModel;
+
+class Film extends BaseModel
+{
+    protected $name = 'movie_film';
+
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    /**
+     * @param $model
+     * @param array $where
+     * @return Film
+     */
+    public function search($model = null, array $where = [])
+    {
+        $model = $model ?? new self();
+
+        return $model->when(isset($where['keywords']) && $where['keywords'], function ($query) use ($where) {
+            $query->where('title', 'like', "%{$where['keywords']}%");
+        })->when(isset($where['cate_one_id']) && $where['cate_one_id'], function ($query) use ($where) {
+            $query->where('cate_one_id', $where['cate_one_id']);
+        })->when(isset($where['cate_two_id']) && $where['cate_two_id'], function ($query) use ($where) {
+            $query->where('cate_two_id', $where['cate_two_id']);
+        })->when(isset($where['city']) && $where['city'], function ($query) use ($where) {
+            $query->where('city', 'like', "%{$where['city']}%");
+        });
+    }
+}

app/common/repositories/movie/CinemaRepository.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * @package merchant
+ * @Author: Qinii
+ * @Date: 2020/5/8
+ */
+
+namespace app\common\repositories\movie;
+
+use app\common\dao\movie\order\MovieOrderDao;
+use app\common\model\movie\cinema\Cinema;
+use app\common\repositories\BaseRepository;
+use think\facade\Db;
+
+/**
+ * Class CinemaRepository
+ * @package app\common\repositories\movie
+ * @author xaboy
+ * @mixin MovieOrderDao
+ */
+class CinemaRepository extends BaseRepository
+{
+    protected $dao;
+
+    /**
+     * ProductRepository constructor.
+     * @param Cinema $dao
+     */
+    public function __construct(Cinema $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param $page
+     * @param $limit
+     * @param $longitude
+     * @param $latitude
+     * @param $where
+     * @param $with
+     * @param $order
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getLocalCinema($page, $limit, $longitude, $latitude, $where = [], $with = [], $order = 1)
+    {
+        $field = 'cinema_sign,cinema_name,address,tel,city_sign,city_name,area_sign,area_name';
+
+        $result = $this->dao->search(null, $where)->when($with, function ($query) use ($with) {
+            $query->with($with);
+        })->when($latitude && $longitude, function ($query) use ($field, $longitude, $latitude) {
+            $query->field([$field, $this->distance($latitude, $longitude)]);
+        })->when($page && $limit, function ($query) use ($page, $limit) {
+            $query->page($page, $limit);
+        })->when(!is_null($order), function ($query) use ($order) {
+            if ($order == 1) {//距离最近
+                $query->order('distance asc');
+            } else {//最新需求
+                $query->order('create_time desc');
+            }
+        })->field([$field])->select()->toArray();
+        foreach ($result as $key => $value) {
+            $result[$key]['distance'] = round($value['distance'] / 1000, 2);
+        }
+
+        return $result;
+    }
+
+    /**
+     * 经纬度排序计算
+     * @param string $latitude
+     * @param string $longitude
+     * @return string
+     */
+    private function distance(string $latitude, string $longitude)
+    {
+        return "(round(6378137 * 2 * asin(sqrt(pow(sin(((latitude * pi()) / 180 - ({$latitude} * pi()) / 180) / 2), 2) 
+        + cos(({$latitude} * pi()) / 180) * cos((latitude * pi()) / 180) * pow(sin(((longitude * pi()) / 180 - ({$longitude} * pi()) / 180) / 2), 2))))) AS distance";
+    }
+}

app/common/repositories/movie/DouHuoMallFilmApiRequest.php

@@ -14,7 +14,7 @@ class DouHuoMallFilmApiRequest
     private static $path = 'http://wmh5.douhuomall.com';
     private static $app_id = 'YS3a8ab661406e47bb86';
     private static $app_secret = '41d8b8e1dd9a454a1abc4534297e33c3';
-    private static $mobile = '16630402568';
+    private static $mobile = '17855366921';
 
     private static $successCode = 200;
     private static $douHuoMallFilmAccessTokenCache = 'DouHuoMallFilmAccessToken';
@@ -63,7 +63,7 @@ class DouHuoMallFilmApiRequest
     {
         $url = '/openapi/Movie/getCity';
         $body = [
-            'Access-Token' => self::get_access_token(),
+            'access_token' => self::get_access_token(),
             'page' => $page,
             'limit' => $limit
         ];
@@ -82,7 +82,7 @@ class DouHuoMallFilmApiRequest
     {
         $url = '/openapi/Movie/getArea';
         $body = [
-            'Access-Token' => self::get_access_token(),
+            'access_token' => self::get_access_token(),
             'city_sign' => $city_sign
         ];
 
@@ -102,7 +102,7 @@ class DouHuoMallFilmApiRequest
     {
         $url = '/openapi/Movie/getCinema';
         $body = [
-            'Access-Token' => self::get_access_token(),
+            'access_token' => self::get_access_token(),
             'page' => $page,
             'limit' => $limit
         ];
@@ -125,7 +125,7 @@ class DouHuoMallFilmApiRequest
     {
         $url = '/openapi/Movie/getFilm';
         $body = [
-            'Access-Token' => self::get_access_token(),
+            'access_token' => self::get_access_token(),
             'page' => $page,
             'limit' => $limit
         ];
@@ -148,7 +148,7 @@ class DouHuoMallFilmApiRequest
     {
         $url = '/openapi/Movie/getFilmSched';
         $body = [
-            'Access-Token' => self::get_access_token(),
+            'access_token' => self::get_access_token(),
             'page' => $page,
             'limit' => $limit,
             'film_sign' => $film_sign,
@@ -171,7 +171,7 @@ class DouHuoMallFilmApiRequest
     {
         $url = '/openapi/Movie/getCinemaSched';
         $body = [
-            'Access-Token' => self::get_access_token(),
+            'access_token' => self::get_access_token(),
             'film_sign' => $film_sign,
             'cinema_sign' => $cinema_sign
         ];
@@ -191,7 +191,7 @@ class DouHuoMallFilmApiRequest
     {
         $url = '/openapi/Movie/getSchedSeat';
         $body = [
-            'Access-Token' => self::get_access_token(),
+            'access_token' => self::get_access_token(),
             'relation_id' => $relation_id,
             'sched_sign' => $sched_sign
         ];
@@ -211,7 +211,7 @@ class DouHuoMallFilmApiRequest
     {
         $url = '/openapi/Movie/submitOrder';
         $body = [
-            'Access-Token' => self::get_access_token(),
+            'access_token' => self::get_access_token(),
             'channel_type' => $channel_type,
             'sched_sign' => $sched_sign,
             'third_order' => $third_order,
@@ -234,7 +234,7 @@ class DouHuoMallFilmApiRequest
     {
         $url = '/openapi/Movie/confirmOrder';
         $body = [
-            'Access-Token' => self::get_access_token(),
+            'access_token' => self::get_access_token(),
             'third_order' => $third_order,
             'order_price' => $order_price
         ];
@@ -253,7 +253,7 @@ class DouHuoMallFilmApiRequest
     {
         $url = '/openapi/Movie/getOrderInfo';
         $body = [
-            'Access-Token' => self::get_access_token(),
+            'access_token' => self::get_access_token(),
             'third_order' => $third_order
         ];
 

app/common/repositories/movie/FilmRepository.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * @package merchant
+ * @Author: Qinii
+ * @Date: 2020/5/8
+ */
+
+namespace app\common\repositories\movie;
+
+use app\common\dao\movie\order\MovieOrderDao;
+use app\common\model\movie\film\Film;
+use app\common\repositories\BaseRepository;
+
+/**
+ * Class FilmRepository
+ * @package app\common\repositories\movie
+ * @author xaboy
+ * @mixin MovieOrderDao
+ */
+class FilmRepository extends BaseRepository
+{
+    protected $dao;
+
+    /**
+     * ProductRepository constructor.
+     * @param Film $dao
+     */
+    public function __construct(Film $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param $page
+     * @param $limit
+     * @param $type
+     * @param $with
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getFilm($page, $limit, $type = 0, $with = [])
+    {
+        $field = 'film_sign,film_name,publish_date,language,type,duration,version,cover_img,grade,hots,director,actors';
+
+        $time = strtotime(date('Y-m-d'));
+        if (empty($type)) {
+            $where = [['publish_date', '<=', $time]];
+        } else {
+            $where = [['publish_date', '>', $time]];
+        }
+
+        $result = $this->dao->where($where)->when($with, function ($query) use ($with) {
+            $query->with($with);
+        })->when($page && $limit, function ($query) use ($page, $limit) {
+            $query->page($page, $limit);
+        })->field([$field])->order('publish_date acs')->select()->toArray();
+
+        foreach ($result as $key => $value) {
+            $result[$key]['publish_date'] = date('Y-m-d', $value['publish_date']);
+            $result[$key]['director'] = json_decode($value['director'], true);
+            $result[$key]['actors'] = json_decode($value['actors'], true);
+            $result[$key]['actors_name'] = !empty($result[$key]['actors']) ? implode(',', array_column($result[$key]['actors'], 'sc_name')) : '';
+            $result[$key]['director_name'] = !empty($result[$key]['director']) ? implode(',', array_column($result[$key]['director'], 'sc_name')) : '';
+        }
+
+        return $result;
+    }
+
+    /**
+     * 经纬度排序计算
+     * @param string $latitude
+     * @param string $longitude
+     * @return string
+     */
+    private function distance(string $latitude, string $longitude)
+    {
+        return "(round(6378137 * 2 * asin(sqrt(pow(sin(((latitude * pi()) / 180 - ({$latitude} * pi()) / 180) / 2), 2) 
+        + cos(({$latitude} * pi()) / 180) * cos((latitude * pi()) / 180) * pow(sin(((longitude * pi()) / 180 - ({$longitude} * pi()) / 180) / 2), 2))))) AS distance";
+    }
+}

app/common/repositories/movie/MovieRepository.php

@@ -273,4 +273,24 @@ class MovieRepository extends BaseRepository
         if (!empty($result) && ($result['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) return $result['data'];
         throw new ValidateException('订单不存在');
     }
+
+    /**
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getLocalMovieCity()
+    {
+        $city_name = [];
+
+        $city = Db::name('movie_city')->field('city_sign,city_name,initial')->where('is_show', 1)->order('id asc')->select();
+        foreach ($city as $key => $value) {
+            $city_name[$value['initial']][] = ['city_sign' => $value['city_sign'], 'city_name' => $value['city_name']];
+        }
+
+        $initial = !empty($city) ? array_values(array_column($city->toArray(), 'initial', 'initial')) : [];
+
+        return compact('city_name', 'initial');
+    }
 }

app/controller/api/movie/Movie.php

@@ -7,6 +7,8 @@
 
 namespace app\controller\api\movie;
 
+use app\common\repositories\movie\CinemaRepository;
+use app\common\repositories\movie\FilmRepository;
 use app\common\repositories\movie\MovieRepository;
 use app\common\repositories\system\groupData\GroupDataRepository;
 use app\controller\merchant\user\User;
@@ -41,11 +43,7 @@ class Movie extends BaseController
      */
     public function getMovieCity()
     {
-        [$page, $limit] = $this->getPage();
-        $initial = $this->request->param('initial', '');
-        $city_name = $this->request->param('city_name', '');
-
-        return app('json')->success($this->repository->getMovieCity($page, $limit, $initial, $city_name));
+        return app('json')->success($this->repository->getLocalMovieCity());
     }
 
     /**
@@ -69,10 +67,16 @@ class Movie extends BaseController
     public function getCinema()
     {
         [$page, $limit] = $this->getPage();
-        $city_sign = $this->request->param('city_sign', '');
-        $area_sign = $this->request->param('area_sign', '');
-
-        return app('json')->success($this->repository->getCinema($page, $limit, $city_sign, $area_sign));
+        $cinema_name = $this->request->param('cinema_name', '');// 影院名称
+        $longitude = $this->request->param('longitude', '');// 经度
+        $latitude = $this->request->param('latitude', '');// 纬度
+        if (empty($longitude)) return app('json')->fail('请授权应用开启定位');
+        if (empty($latitude)) return app('json')->fail('请授权应用开启定位');
+        $where = !empty($cinema_name) ? ['cinema_name' => $cinema_name] : [];
+
+        /** @var CinemaRepository $cinemaRepository */
+        $cinemaRepository = app()->make(CinemaRepository::class);
+        return app('json')->success($cinemaRepository->getLocalCinema($page, $limit, $longitude, $latitude, $where));
     }
 
     /**
@@ -83,10 +87,11 @@ class Movie extends BaseController
     public function getFilm()
     {
         [$page, $limit] = $this->getPage();
-        $cinema_sign = $this->request->param('cinema_sign', '');
-        $film_sign = $this->request->param('film_sign', '');
+        $type = $this->request->param('type', 0);//热映：0：正在热映，1：即将上映
 
-        return app('json')->success($this->repository->getFilm($page, $limit, $cinema_sign, $film_sign));
+        /** @var FilmRepository $filmRepository */
+        $filmRepository = app()->make(FilmRepository::class);
+        return app('json')->success($filmRepository->getFilm($page, $limit, $type));
     }
 
     /**

config/console.php

@@ -21,6 +21,9 @@ return [
         'ln:user_bill' => 'app\command\test\ln\UserBill',
         'ln:import_user_cxb' => 'app\command\test\ln\ImportUser2',
 //        'great_life_order_independent_account' => 'app\command\GreatLifeOrderIndependentAccount',
-//        'commercial-\_area_order_independent_account' => 'app\command\CommercialAreaOrderIndependentAccount'
+//        'commercial-\_area_order_independent_account' => 'app\command\CommercialAreaOrderIndependentAccount',
+        'movie_city_area' => 'app\command\MovieCityAreaCommand',
+        'movie_cinema' => 'app\command\MovieCinemaCommand',
+        'movie_film' => 'app\command\MovieFilmCommand'
     ],
 ];