shish 1 год назад
Родитель
Сommit
802837dde6
1 измененных файлов с 8 добавлено и 8 удалено
  1. 8 8
      app-hd/controllers/OrderController.php

+ 8 - 8
app-hd/controllers/OrderController.php

@@ -320,14 +320,14 @@ class OrderController extends BaseController
         $order = OrderClass::getById($id, true);
         OrderClass::valid($order, $this->mainId);
 
-//        if ($order->status == OrderClass::ORDER_STATUS_CANCEL) {
-//            $msg = '订单已取消';
-//            util::success(['returnStatus' => 'FAILURE'], $msg);
-//        }
-//        if ($order->status != OrderClass::ORDER_STATUS_UN_PAY) {
-//            $msg = '订单不是待付款状态';
-//            util::success(['returnStatus' => 'FAILURE'], $msg);
-//        }
+        if ($order->status == OrderClass::ORDER_STATUS_CANCEL) {
+            $msg = '订单已取消';
+            util::success(['returnStatus' => 'FAILURE'], $msg);
+        }
+        if ($order->status != OrderClass::ORDER_STATUS_UN_PAY) {
+            $msg = '订单不是待付款状态';
+            util::success(['returnStatus' => 'FAILURE'], $msg);
+        }
 
         $shop = $this->shop;
         $sj = $shop->merchantName;