订单取消问题

app-ghs/controllers/OrderController.php

@@ -538,6 +538,9 @@ class OrderController extends BaseController
         if ($order->status == OrderClass::ORDER_STATUS_COMPLETE) {
             util::complete('订单已付款');
         }
+        if ($order->status == OrderClass::ORDER_STATUS_CANCEL) {
+            util::complete('订单已取消');
+        }
         if ($order->status != OrderClass::ORDER_STATUS_UN_PAY) {
             util::complete('订单不是待付款状态');
         }
@@ -661,6 +664,10 @@ class OrderController extends BaseController
             $msg = '没有找到订单';
             util::success(['returnStatus' => 'FAILURE'], $msg);
         }
+        if ($order->status == 5) {
+            $msg = '订单已取消';
+            util::success(['returnStatus' => 'FAILURE'], $msg);
+        }
         if ($order->status != 1) {
             $msg = '不是待付款订单';
             util::success(['returnStatus' => 'FAILURE'], $msg);

app-hd/controllers/OrderController.php

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

common/components/util.php

@@ -277,7 +277,7 @@ class util
         Yii::info($msg);
 
         $report = isset(Yii::$app->params['errorReport']) ? Yii::$app->params['errorReport'] : 0;
-        Yii::info("report:".$report);
+
         if ($report == 1) {
             throw new \Exception($msg);
         }