调整订单状态

app/common/repositories/movie/MovieRepository.php

@@ -190,11 +190,6 @@ class MovieRepository extends BaseRepository
         $storeOrder = app()->make(StoreOrderRepository::class);
         $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('观影场次不存在');
-
         $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'])
             || empty($channel_sn['price']) || json_last_error()) {
@@ -528,7 +523,7 @@ class MovieRepository extends BaseRepository
             $plat_orderinfo['type'] = ($orderinfo['pay_type'] == 1) ? 'wx' : ($orderinfo['pay_type'] == 2 ? 'ali' : 'wx');
             $plat_orderinfo['order_price'] = $orderinfo['order_price'];
             $plat_orderinfo['order_sn'] = $order_sn;
-            $plat_orderinfo['create_time'] = strtotime($orderinfo['create_time']);
+            $plat_orderinfo['create_time'] = strtotime($orderinfo['create_time']);// 下单时间戳
             $plat_orderinfo['phone'] = $orderinfo['mobile'];
             $plat_orderinfo['sched_seat'] = json_decode($orderinfo['sched_seat'], true);
             $plat_orderinfo['cinema'] = [
@@ -551,20 +546,12 @@ class MovieRepository extends BaseRepository
             ];
             $plat_orderinfo['sched_time'] = date('Y-m-d H:i', strtotime($result['data']['sched_time']));
             $plat_orderinfo['schedend_time'] = date('m-d H:i', strtotime($result['data']['sched_time']) + $film['duration'] * 60);
-            $plat_orderinfo['time_remaining'] = 0;// 剩余时间
-            // 0 待支付 1 已支付 2已超时 3已取消 4已成功
-            $create_time = $plat_orderinfo['create_time'] + self::tenMinute;
-            if ($orderinfo['status'] == 0 && ($create_time < $time)) {
-                $plat_orderinfo['status'] = 0;
-                $plat_orderinfo['state'] = '待付款';
-                $plat_orderinfo['time_remaining'] = $time - $plat_orderinfo['create_time'];
-            } elseif ($orderinfo['status'] == 1) {
-                $plat_orderinfo['status'] = 1;
-                $plat_orderinfo['state'] = '已支付';
-            } else {
-                $plat_orderinfo['status'] = 3;
-                $plat_orderinfo['state'] = '支付超时，已取消';
-            }
+
+            // 订单状态 0：待支付；1：已出票；3：已取消
+            $statuspayinfo = $this->getOrderStatus($plat_orderinfo['create_time'], $plat_orderinfo['status']);
+            $plat_orderinfo['status'] = $statuspayinfo['status'];
+            $plat_orderinfo['state'] = $statuspayinfo['state'];
+            $plat_orderinfo['time_remaining'] = $statuspayinfo['time_remaining'];// 支付倒计时
 
             unset($plat_orderinfo['plat_order']);
             unset($plat_orderinfo['third_order']);
@@ -574,6 +561,39 @@ class MovieRepository extends BaseRepository
     }
 
     /**
+     * 获取订单状态
+     *
+     * @param $create_time
+     * @param $plat_status
+     * @return array
+     */
+    private function getOrderStatus($create_time, $plat_status = 0)
+    {
+        $time_remaining = 0;
+
+        $time = time();
+        // 订单状态 0：待支付；1：已出票；3：已取消
+        $create_time = $create_time + self::tenMinute;
+        if ($plat_status == 1 && ($create_time < $time)) {
+            $status = 0;
+            $state = '待付款';
+            $time_remaining = $time - $create_time;
+        } elseif ($plat_status == 5) {
+            $status = 3;
+            $state = '支付超时，已取消';
+        } elseif ($plat_status == 6) {
+            $status = 1;
+            $state = '已出票';
+        } else {
+            $status = 3;
+            $state = '支付超时，已取消';
+        }
+
+        return compact('status', 'state', 'time_remaining');
+
+    }
+
+    /**
      * @return array
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
@@ -845,7 +865,7 @@ class MovieRepository extends BaseRepository
             default:
                 break;
         }
-        $time = time();
+        $film = [];
 
         $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)
@@ -853,23 +873,16 @@ class MovieRepository extends BaseRepository
                 $query->page($page, $limit);
             })->order('order_id desc')->field([$field])->select()->toArray();
         foreach ($movie_order as $key => $value) {
+            if (!isset($film[$value['film_sign']])) $film[$value['film_sign']] = Db::name('movie_film')->where('film_sign', $value['film_sign'])->value('cover_img');
             $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');
-            $movie_order[$key]['time_remaining']= 0;
-
-            // 0 待支付 1 已支付 2已超时 3已取消 4已成功
-            $create_time = strtotime($value['create_time']) + self::tenMinute;
-            if ($value['status'] == 0 && ($create_time < $time)) {
-                $movie_order[$key]['status'] = 0;
-                $movie_order[$key]['state'] = '待付款';
-                $movie_order[$key]['time_remaining'] = $time - strtotime($value['create_time']);
-            } elseif ($value['status'] == 1) {
-                $movie_order[$key]['status'] = 1;
-                $movie_order[$key]['state'] = '已支付';
-            } else {
-                $movie_order[$key]['status'] = 3;
-                $movie_order[$key]['state'] = '支付超时，已取消';
-            }
+            $movie_order[$key]['cover_img'] = $film[$value['film_sign']];
+            $movie_order[$key]['time_remaining'] = 0;
+
+            // 订单状态 0：待支付；1：已出票；3：已取消
+            $statuspayinfo = $this->getOrderStatus(strtotime($value['create_time']), $value['status']);
+            $movie_order[$key]['status'] = $statuspayinfo['status'];
+            $movie_order[$key]['state'] = $statuspayinfo['state'];
+            $movie_order[$key]['time_remaining'] = $statuspayinfo['time_remaining'];// 支付倒计时
         }
 
         $count = $this->dao->search($where)->count();

app/controller/api/movie/Movie.php

@@ -205,7 +205,7 @@ class Movie extends BaseController
         try {
             $order = $this->repository->submitOrder($this->request->userInfo(), $params);
             if (!empty($order)) {
-                return app('json')->success(['order_sn' => $order['order_sn'], 'oid' => $order['order_id'], 'code' => '', 'type' => 'wx']);
+                return app('json')->success(['order_sn' => $order['order_sn'], 'oid' => $order['order_id'], 'type' => 'wx']);
             } else {
                 return app('json')->fail('锁座下单失败');
             }