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