客户下单，不能主动取消

app-ghs/controllers/OrderController.php

@@ -49,19 +49,19 @@ class OrderController extends BaseController
         $id = isset($get['id']) ? $get['id'] : 0;
         $order = OrderClass::getById($id, true);
         if (isset($order->status) == false || $order->status != 1) {
-            util::fail('不是待付款订单');
+            util::success(['returnStatus' => 'FAILURE'], '不是待付款订单');
         }
         OrderClass::valid($order, $this->shopId);
         $cgId = $order->purchaseId ?? 0;
         $cg = PurchaseClass::getById($cgId, true);
         $orderSn = $cg->orderSn ?? '';
         if (empty($orderSn)) {
-            util::fail('没有找到采购单');
+            util::success(['returnStatus' => 'FAILURE'], '没有找到采购单');
         }
         $deadline = $cg->deadline;
         $current = date("Y-m-d H:i:s");
         if ((strtotime($deadline) + 20) < strtotime($current)) {
-            util::fail('订单已经失效');
+            util::success(['returnStatus' => 'FAILURE'], '订单已经失效');
         }
         $totalFee = $cg->actPrice ?? 0;
 
@@ -114,11 +114,11 @@ class OrderController extends BaseController
             $result = $notify->GetPayUrl($input, $sjExtend);
             $url = $result["code_url"] ?? '';
             if (empty($url)) {
-                util::fail('二维码生成失败');
+                util::success(['returnStatus' => 'FAILURE'], '二维码生成失败');
             }
             $suffixUrl = qrCodeUtil::generateShortTimeGatheringQrCode($url, $this->sjId, $this->shopId, $payWay);
             $payUrl = Yii::$app->params['ghsImgHost'] . $suffixUrl;
-            util::success(['url' => $payUrl]);
+            util::success(['url' => $payUrl, 'returnStatus' => 'SUCCESS']);
         }
         if ($payWay == $aliPayWay) {
 
@@ -170,15 +170,15 @@ class OrderController extends BaseController
                 $respond = $qrPayResult->getResponse();
                 $url = $respond->qr_code ?? '';
                 if (empty($url)) {
-                    util::fail('二维码生成失败');
+                    util::success(['returnStatus' => 'FAILURE'], '二维码生成失败');
                 }
                 $suffixUrl = qrCodeUtil::generateShortTimeGatheringQrCode($url, $this->sjId, $this->shopId, $payWay);
                 $payUrl = Yii::$app->params['ghsImgHost'] . $suffixUrl;
-                util::success(['url' => $payUrl]);
+                util::success(['url' => $payUrl, 'returnStatus' => 'SUCCESS']);
             }
-            util::fail('二维码生成失败..');
+            util::success(['returnStatus' => 'FAILURE'], '二维码生成失败..');
         }
-        util::fail('不支持的收款方式');
+        util::success(['returnStatus' => 'FAILURE'], '不支持的收款方式');
     }
 
     //微信和支付宝付款码支付复查 shish 20211231
@@ -1195,6 +1195,11 @@ class OrderController extends BaseController
         }
         $id = Yii::$app->request->get('id');
         $order = OrderClass::getById($id, true);
+
+        if ($order->orderType == 2) {
+            util::fail('客户下单，不能主动取消');
+        }
+
         OrderClass::valid($order, $this->shopId);
         OrderService::expire($order, true);
         util::complete('已取消');