Browse Source

订单支付

Gorden 1 month ago
parent
commit
15e47bd1de
1 changed files with 16 additions and 4 deletions
  1. 16 4
      app/admin/controller/order/WholeController.php

+ 16 - 4
app/admin/controller/order/WholeController.php

@@ -1319,7 +1319,10 @@ class WholeController extends Curd
             if ($order->order_status_payment != 'SUCCESS') {
                 _syslog("订单", "支付异常,检查是否有轮询");
                 // 恢复优惠券到已占用
-                $this->changeOrderCouponStatus(json_decode($couponUseJson, true), 'WAITING');
+                if (!is_array($couponUseJson)){
+                    $couponUseJson = json_decode($couponUseJson, true);
+                }
+                $this->changeOrderCouponStatus($couponUseJson, 'WAITING');
 
                 return json_throw(2001, '支付异常', ['order_id' => $params['orderId']]);
             }
@@ -1769,7 +1772,10 @@ class WholeController extends Curd
             if ($order->order_status_payment != 'SUCCESS') {
                 _syslog("订单", "支付异常,检查是否有轮询");
                 // 恢复优惠券到已占用
-                $this->changeOrderCouponStatus(json_decode($couponUseJson, true), 'WAITING');
+                if (!is_array($couponUseJson)){
+                    $couponUseJson = json_decode($couponUseJson, true);
+                }
+                $this->changeOrderCouponStatus($couponUseJson, 'WAITING');
                 return json_throw(2001, '支付异常', ['order_id' => $params['orderId']]);
             }
             _syslog("订单", "订单支付成功");
@@ -2509,7 +2515,10 @@ class WholeController extends Curd
             if ($params['settlement_now'] == 'Y' && $params['order_status_payment'] != 'SUCCESS') {
                 _syslog("订单", "支付异常,检查是否有轮询");
                 // 恢复优惠券到已占用
-                $this->changeOrderCouponStatus(json_decode($couponUseJson, true), 'WAITING');
+                if (!is_array($couponUseJson)){
+                    $couponUseJson = json_decode($couponUseJson, true);
+                }
+                $this->changeOrderCouponStatus($couponUseJson, 'WAITING');
 
                 return json_throw(2001, '支付异常', ['order_id' => $params['orderId']]);
             }
@@ -3058,7 +3067,10 @@ class WholeController extends Curd
             if ($params['settlement_now'] == 'Y' && $params['order_status_payment'] != 'SUCCESS') {
                 _syslog("订单", "支付异常,检查是否有轮询");
                 // 恢复优惠券到已占用
-                $this->changeOrderCouponStatus(json_decode($couponUseJson, true), 'WAITING');
+                if (!is_array($couponUseJson)){
+                    $couponUseJson = json_decode($couponUseJson, true);
+                }
+                $this->changeOrderCouponStatus($couponUseJson, 'WAITING');
 
                 return json_throw(2001, '支付异常', ['order_id' => $params['orderId']]);
             }