预订结束

app-ghs/controllers/OrderController.php

@@ -284,7 +284,9 @@ class OrderController extends BaseController
             $shop = $this->shop;
             $bookSn = $shop->bookSn ?? 0;
             if (!empty($bookSn)) {
-                util::fail('预订结束了才能确认');
+                if ($order->bookSn == $bookSn) {
+                    util::fail('预订结束了才能确认');
+                }
             }
 
             OrderService::arrival($order, $post);
@@ -720,8 +722,8 @@ class OrderController extends BaseController
     public function actionList()
     {
         $staff = $this->shopAdmin;
-        if(isset($staff->identity) && $staff->identity == 2){
-            util::success(['list'=>[]]);
+        if (isset($staff->identity) && $staff->identity == 2) {
+            util::success(['list' => []]);
         }
 
         $get = Yii::$app->request->get();