瀏覽代碼

注释部分

shish 1 年之前
父節點
當前提交
670bd448a7
共有 2 個文件被更改,包括 9 次插入9 次删除
  1. 8 8
      app-hd/controllers/OrderController.php
  2. 1 1
      composer.json

+ 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;

+ 1 - 1
composer.json

@@ -14,7 +14,7 @@
     },
     "minimum-stability": "dev",
     "require": {
-        "php": ">=7.0",
+        "php": ">=5.4.0",
         "yiisoft/yii2": "2.0.29",
         "yiisoft/yii2-bootstrap": "~2.0.6",
         "yiisoft/yii2-swiftmailer": "~2.0.6",