锁座订单接口返回订单编码

app/command/MovieOrderCommand.php

@@ -31,7 +31,7 @@ class MovieOrderCommand extends Command
      */
     private function doMovieOrder()
     {
-        $tenMinute = 600; // 10分钟
+        $tenMinute = MovieRepository::tenMinute; // 10分钟
         $time = time();
 
         /** @var MovieRepository $movieOrderRepository */

app/common/repositories/movie/MovieRepository.php

@@ -33,6 +33,7 @@ class MovieRepository extends BaseRepository
     const yanglaojin_ratio = 0.3;
 
     const pv_ratio = 0.7;
+    const tenMinute = 600;
 
     /**
      * ProductRepository constructor.
@@ -249,7 +250,7 @@ class MovieRepository extends BaseRepository
                 if ($orderModel) return $orderModel['order_id'];
                 throw new ValidateException('锁座下单失败');
             });
-            return $order_id;
+            return compact('order_id', 'order_sn');
         } else {
             throw new ValidateException($submitOrder['msg']);
         }
@@ -519,6 +520,7 @@ class MovieRepository extends BaseRepository
         $orderinfo = $this->dao->search(['order_sn' => $order_sn, 'uid' => $userinfo['uid']])->find();
         if (empty($orderinfo)) throw new ValidateException('订单不存在');
 
+        $time = time();
         $result = DouHuoMallFilmApiRequest::getOrderInfo($order_sn);
         if (!empty($result) && ($result['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) {
             $plat_orderinfo = $result['data'];
@@ -549,9 +551,18 @@ 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);
-            if ($plat_orderinfo['status'] == 1) {
+            $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'] = '待付款';
+            } elseif ($orderinfo['status'] == 1) {
+                $plat_orderinfo['status'] = 1;
+                $plat_orderinfo['state'] = '已支付';
+            } else {
+                $plat_orderinfo['status'] = 3;
+                $plat_orderinfo['state'] = '支付超时，已取消';
             }
 
             unset($plat_orderinfo['plat_order']);

app/controller/api/movie/Movie.php

@@ -203,9 +203,9 @@ class Movie extends BaseController
         if (empty($params['sched_seat'])) return app('json')->fail('请选择观影座位');
 
         try {
-            $order_id = $this->repository->submitOrder($this->request->userInfo(), $params);
-            if (!empty($order_id)) {
-                return app('json')->success(['oid' => $order_id, 'code' => '', 'type' => 'wx']);
+            $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']);
             } else {
                 return app('json')->fail('锁座下单失败');
             }