防止取消订单可付款

app-hd/controllers/OrderController.php

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