电影订单超时检查

app/command/MovieOrderCommand.php

@@ -14,7 +14,7 @@ class MovieOrderCommand extends Command
     protected function configure()
     {
         // 指令配置
-        $this->setName('movie-order')->setDescription('电影-订单');
+        $this->setName('movie_order')->setDescription('电影-订单');
     }
 
     protected function execute(Input $input, Output $output)
@@ -31,79 +31,19 @@ class MovieOrderCommand extends Command
      */
     private function doMovieOrder()
     {
-        $page = 1;
-        $limit = 100;
+        $tenMinute = 600; // 10分钟
+        $time = time();
 
         /** @var MovieRepository $movieOrderRepository */
         $movieOrderRepository = app()->make(MovieRepository::class);
-        $filmLists = $movieOrderRepository->getOrderListAll($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']);
-                }
-            }
-        }
-    }
-
-    /**
-     * 电影-获取影片列表
-     *
-     * @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;
-        }, []) : [];
-        $time = strtotime(date('Y-m-d'));
-
-        foreach ($list as $key => $value) {
-            $publish_date = strtotime($value['publish_date']);
-            $params = [
-                'film_sign' => $value['film_sign'],
-                'film_name' => $value['film_name'],
-                'publish_date' => $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'],
-                'is_show' => intval(($publish_date <= $time))
-            ];
-            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);
-                }
+        $movieOrder = $movieOrderRepository->getOrderListAll([0]);
+
+        foreach ($movieOrder as $key => $order) {
+            $create_time = strtotime($order['create_time']) + $tenMinute;
+            // 下单时间 + 10分钟 < 当前时间：表示订单超时
+            if ($create_time < $time) {
+                $update = ['status' => 3, 'update_time' => time()];
+                Db::name('order_movie')->where(['order_id' => $order['order_id']])->update($update);
             }
         }
     }

app/common/repositories/movie/MovieRepository.php

@@ -850,48 +850,25 @@ class MovieRepository extends BaseRepository
     }
 
     /**
-     * 订单列表
+     * 所有未支付订单列表
      *
-     * @param $userinfo
-     * @param $page
-     * @param $limit
-     * @param $type
+     * @param $status
+     * @param $paid
      * @return array
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getOrderListAll($userinfo, $page, $limit, $type = -1)
+    public function getOrderListAll($status = [], $paid = 0)
     {
-        $where['uid'] = $userinfo['uid'];
-        switch ($type) {
-            case 0:
-                $where['status'] = [0];
-                break;
-            case 1:
-            case 4:
-                $where['status'] = [1, 4];
-                break;
-            case 2:
-            case 3:
-                $where['status'] = [2, 3];
-                break;
-            default:
-                break;
-        }
-
-        $field = 'order_sn,order_price,city_name,area_name,cinema_name,address,hall_name,film_sign,film_name,show_date,show_time,sched_seat,number,status,create_time';
-        $movie_order = $this->dao->search($where)
-            ->when($page && $limit, function ($query) use ($page, $limit) {
-                $query->page($page, $limit);
-            })->order('order_id desc')->field([$field])->select()->toArray();
-        foreach ($movie_order as $key => $value) {
-            $movie_order[$key]['sched_seat'] = json_decode($value['sched_seat'], true);
-            $movie_order[$key]['cover_img'] = Db::name('movie_film')->where('film_sign', $value['film_sign'])->value('cover_img');
-        }
+        $where = ['status' => $status, 'paid' => $paid];
 
-        $count = $this->dao->search($where)->count();
+        $field = 'order_id,order_price,city_name,area_name,cinema_name,address,hall_name,film_sign,film_name,show_date,show_time,sched_seat,number,status,create_time';
+        //        foreach ($movie_order as $key => $value) {
+//            $movie_order[$key]['sched_seat'] = json_decode($value['sched_seat'], true);
+//            $movie_order[$key]['cover_img'] = Db::name('movie_film')->where('film_sign', $value['film_sign'])->value('cover_img');
+//        }
 
-        return compact('movie_order', 'count');
+        return $this->dao->search($where)->order('create_time asc')->field([$field])->select()->toArray();
     }
 }

config/console.php

@@ -29,5 +29,6 @@ return [
         'cinema_film_sched' => 'app\command\CinemaSchedCommand',
         'repair_pv_log' => 'app\command\repairPvLog',
         'gzcAddByBill' => 'app\command\GzcAddByBillCommand',
+        'movie_order' => 'app\command\MovieOrderCommand',
     ],
 ];