From 9f7cff7431e7a22e5b705a7215dcb67a227fd158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 31 Dec 2024 16:31:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/sqx/modules/job/task/TempOrdersTask.java | 4 +++-
 src/main/java/com/sqx/modules/pay/wuyou/BaseResp.java      | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
index e2dd719e..4188af77 100644
--- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
+++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
@@ -112,9 +112,10 @@ public class TempOrdersTask {
                 BaseResp baseResp = wuyouPay.queryOrder(payDetails.getTradeNo(), order.getPayMoney().toString(), "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1 Edg/131.0.0.0");
                 logger.info("baseResp：{} ", JSONUtil.toJsonStr(baseResp));
                 if (baseResp.getCode() == null || baseResp.getCode() != 200) {
+                    logger.info("code错误跳过");
                     continue;
                 }
-                if ("SUCCESS".equals(baseResp.getPayStatus())) {
+                if ("SUCCESS".equals(baseResp.getPayStatus()) || "SUCCESS".equals(baseResp.getPayStatus2())) {
                     if (payDetails.getState() == 1) {
                         continue;
                     }
@@ -122,6 +123,7 @@ public class TempOrdersTask {
                     logger.info("order：{} ", JSONUtil.toJsonStr(order));
                     updateOrderStatus(payDetails, order);
                 } else {
+                    logger.info("订单未支付，修改状态: {}", payDetails.getTradeNo());
                     order.setStatus(3);
                     payDetails.setState(2);
                     ordersDao.updateById(order);
diff --git a/src/main/java/com/sqx/modules/pay/wuyou/BaseResp.java b/src/main/java/com/sqx/modules/pay/wuyou/BaseResp.java
index bfbeba72..f4870b43 100644
--- a/src/main/java/com/sqx/modules/pay/wuyou/BaseResp.java
+++ b/src/main/java/com/sqx/modules/pay/wuyou/BaseResp.java
@@ -17,6 +17,8 @@ public class BaseResp {
     // 支付 只有  SUCCESS 是成功的
     @JSONField(name = "pay_status")
     private String payStatus;
+    @JSONField(name = "payStatus")
+    private String payStatus2;
 
     @JSONField(name = "error_msg")
     private String errorMsg;