待付款

app-ghs/controllers/OrderController.php

@@ -614,15 +614,8 @@ class OrderController extends BaseController
         OrderClass::valid($order, $this->shopId);
         if ($order->payStatus == 1) {
             util::success(['returnStatus' => 'SUCCESS']);
-        }
-        if ($order->status == OrderClass::ORDER_STATUS_COMPLETE) {
-            util::complete('订单已付款');
-        }
-        if ($order->status == OrderClass::ORDER_STATUS_CANCEL) {
-            util::complete('订单已取消');
-        }
-        if ($order->status != OrderClass::ORDER_STATUS_UN_PAY) {
-            util::complete('订单不是待付款状态');
+        }else {
+            util::success(['returnStatus' => 'unPay']);
         }
         OrderClass::valid($order, $this->shopId);
         $cgId = $order->purchaseId ?? 0;
@@ -753,15 +746,8 @@ class OrderController extends BaseController
         OrderClass::valid($order, $this->shopId);
         if ($order->payStatus == 1) {
             util::success(['returnStatus' => 'SUCCESS']);
-        }
-        if ($order->status == OrderClass::ORDER_STATUS_COMPLETE) {
-            util::complete('订单已付款');
-        }
-        if ($order->status == OrderClass::ORDER_STATUS_CANCEL) {
-            util::complete('订单已取消');
-        }
-        if ($order->status != OrderClass::ORDER_STATUS_UN_PAY) {
-            util::complete('订单不是待付款状态');
+        } else {
+            util::success(['returnStatus' => 'unPay']);
         }
         $cgId = $order->purchaseId ?? 0;
         $cg = PurchaseClass::getById($cgId, true);
@@ -873,6 +859,7 @@ class OrderController extends BaseController
             util::fail('支付失败');
         }
     }
+
     /**
      * 微信和支付宝付款码支付
      * 职责：处理商户扫描客户付款码（被扫支付）的请求，调用拉卡拉支付接口并更新本地订单状态

app-hd/controllers/OrderController.php

@@ -349,15 +349,8 @@ class OrderController extends BaseController
         $totalFee = $order->mainPay ?? 0;
         if ($order->payStatus == 1) {
             util::success(['returnStatus' => 'SUCCESS']);
-        }
-        if ($order->status == OrderClass::ORDER_STATUS_COMPLETE) {
-            util::success(['returnStatus' => 'SUCCESS']);
-        }
-        if ($order->status == OrderClass::ORDER_STATUS_CANCEL) {
-            util::complete('订单已取消');
-        }
-        if ($order->status != OrderClass::ORDER_STATUS_UN_PAY) {
-            util::complete('订单不是待付款状态');
+        } else {
+            util::success(['returnStatus' => 'unPay']);
         }
 
         $connection = Yii::$app->db;
@@ -452,12 +445,8 @@ class OrderController extends BaseController
         $totalFee = $order->mainPay ?? 0;
         if ($order->payStatus == 1) {
             util::success(['returnStatus' => 'SUCCESS']);
-        }
-        if ($order->status == OrderClass::ORDER_STATUS_CANCEL) {
-            util::complete('订单已取消');
-        }
-        if ($order->status != OrderClass::ORDER_STATUS_UN_PAY) {
-            util::complete('订单不是待付款状态');
+        } else {
+            util::success(['returnStatus' => 'unPay']);
         }
 
         $connection = Yii::$app->db;