Merge branch 'dev' of git.huaml.com:zhh/huahuibao into dev

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;

common/components/util.php

@@ -289,7 +289,6 @@ class util
         $report = isset(Yii::$app->params['errorReport']) ? Yii::$app->params['errorReport'] : 0;
         if ($report == 1) {
             throw new \Exception($msg);
-            return false;
         }
         self::encode(['code' => 0, 'msg' => $msg, 'data' => [], 'mask' => $mask, 'icon' => $icon, 'duration' => $duration]);
     }