支付代码改进

app-ghs/controllers/OrderController.php

@@ -611,7 +611,8 @@ class OrderController extends BaseController
         util::checkRepeatCommit($id, 3);
 
         $order = OrderClass::getById($id, true);
-        if (empty($order)) {
+        OrderClass::valid($order, $this->shopId);
+        if ($order->payStatus == 1) {
             util::success(['returnStatus' => 'SUCCESS']);
         }
         if ($order->status == OrderClass::ORDER_STATUS_COMPLETE) {
@@ -741,12 +742,16 @@ class OrderController extends BaseController
         ini_set('date.timezone', 'Asia/Shanghai');
         header("Content-type: text/html; charset=utf-8");
         $get = Yii::$app->request->get();
-        $id = isset($get['id']) ? $get['id'] : 0;
+        $id = $get['id'] ?? 0;
 
         util::checkRepeatCommit($id, 3);
 
         $order = OrderClass::getById($id, true);
         if (empty($order)) {
+            util::complete('没有找到订单呢');
+        }
+        OrderClass::valid($order, $this->shopId);
+        if ($order->payStatus == 1) {
             util::success(['returnStatus' => 'SUCCESS']);
         }
         if ($order->status == OrderClass::ORDER_STATUS_COMPLETE) {
@@ -758,7 +763,6 @@ class OrderController extends BaseController
         if ($order->status != OrderClass::ORDER_STATUS_UN_PAY) {
             util::complete('订单不是待付款状态');
         }
-        OrderClass::valid($order, $this->shopId);
         $cgId = $order->purchaseId ?? 0;
         $cg = PurchaseClass::getById($cgId, true);
         $orderSn = $cg->orderSn ?? '';

app-hd/controllers/OrderController.php

@@ -275,8 +275,8 @@ class OrderController extends BaseController
     public function actionBatchFetch()
     {
         $where = ["status" => 2, "sendType" => 1, "shopId" => $this->shopId];
-        $orderList = OrderService::getLimitList("id",$where,500,"id desc");
-        $ids = ArrayHelper::getColumn($orderList,"id");
+        $orderList = OrderService::getLimitList("id", $where, 500, "id desc");
+        $ids = ArrayHelper::getColumn($orderList, "id");
         OrderService::updateByIds($ids, ["status" => 4]);
         util::complete($ids);
     }
@@ -347,6 +347,9 @@ class OrderController extends BaseController
         OrderClass::valid($order, $this->mainId);
         $orderSn = $order->orderSn ?? '';
         $totalFee = $order->mainPay ?? 0;
+        if ($order->payStatus == 1) {
+            util::success(['returnStatus' => 'SUCCESS']);
+        }
         if ($order->status == OrderClass::ORDER_STATUS_COMPLETE) {
             util::success(['returnStatus' => 'SUCCESS']);
         }
@@ -439,7 +442,7 @@ class OrderController extends BaseController
         ini_set('date.timezone', 'Asia/Shanghai');
         header("Content-type: text/html; charset=utf-8");
         $get = Yii::$app->request->get();
-        $id = isset($get['id']) ? $get['id'] : 0;
+        $id = $get['id'] ?? 0;
 
         util::checkRepeatCommit($id, 3);
 
@@ -447,7 +450,7 @@ class OrderController extends BaseController
         OrderClass::valid($order, $this->mainId);
         $orderSn = $order->orderSn ?? '';
         $totalFee = $order->mainPay ?? 0;
-        if ($order->status == OrderClass::ORDER_STATUS_COMPLETE) {
+        if ($order->payStatus == 1) {
             util::success(['returnStatus' => 'SUCCESS']);
         }
         if ($order->status == OrderClass::ORDER_STATUS_CANCEL) {
@@ -532,6 +535,7 @@ class OrderController extends BaseController
             util::complete('支付失败');
         }
     }
+
     /**
      * 微信和支付宝付款码支付
      * 职责：处理商户扫描客户付款码（被扫支付）的请求，调用拉卡拉支付接口并更新本地订单状态（零售端）
@@ -965,7 +969,7 @@ class OrderController extends BaseController
                         if ($hasPay != dict::getDict('hasPay', 'balance')) {
                             util::fail('用红包要用余额支付');
                         } else {
-                            if($custom->balance < $post['modifyPrice']) {
+                            if ($custom->balance < $post['modifyPrice']) {
                                 util::fail('用红包要用余额支付(您的余额不足)');
                             }
                         }
@@ -1456,7 +1460,7 @@ class OrderController extends BaseController
         }
         $list = OrderService::getOrderList($where);
         $list['shop'] = $this->shop->attributes ?? [];
-        
+
         util::success($list);
     }