From 1a5ff593241f15fdae4f4467f637c7f69e20a704 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Thu, 16 Jul 2026 14:45:28 +0800
Subject: [PATCH] 20260716

---
 .../gxwebsoft/open/controller/OpenAlipayController.java   | 8 ++++----
 .../com/gxwebsoft/shop/controller/PaymentController.java  | 2 +-
 src/main/resources/application-prod.yml                   | 4 ++--
 src/main/resources/application.yml                        | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java b/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java
index 9ca29eb..9051388 100644
--- a/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java
+++ b/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java
@@ -79,14 +79,14 @@ public class OpenAlipayController extends BaseController {
         // 验证签名
         isCheckSign();
         // 读取缓存信息
-        String key = "setting:register:" + getTenantId();
-        String setting = redisUtil.get(key);
+//        String key = "setting:register:" + getTenantId();
+//        String setting = redisUtil.get(key);
 
 //        if (setting == null) {
 //            throw new BusinessException("请先配置注册设置");
 //        }
-        JSONObject jsonObject = JSONObject.parseObject(setting);
-        String roleId = jsonObject.getString("roleId");
+//        JSONObject jsonObject = JSONObject.parseObject(setting);
+//        String roleId = jsonObject.getString("roleId");
         // 实例化客户端
         DefaultAlipayClient alipayClient = alipayConfig.alipayClient(param.getTenantId());
         try {
diff --git a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java b/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java
index 1739de5..d24bd73 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java
@@ -297,7 +297,7 @@ public class PaymentController extends BaseController {
 //            log.info("支付宝支付返回信息:{}", response);
             if(!response.isSuccess()){
                 String subCode = response.getSubCode();
-                if("ACQ.TRADE_HAS_CLOSE".equals(subCode)){
+                if("ACQ.TRADE_HAS_CLOSE".equals(subCode) || "ACQ.TRADE_HAS_SUCCESS".equals(subCode)){
                     String orderNoNew = IdUtil.getSnowflakeNextIdStr();
                     log.warn("原支付宝支付订单{}已关闭！重新生成支付订单号{}！", orderNo, orderNoNew);
                     order.setOrderNo(orderNoNew);
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index fd2c952..4c95037 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -3,9 +3,9 @@
 # 数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://1.14.159.185:3318/yunxinwei?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://1Panel-mysql-LCaM:3306/yunxinwei?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
     username: yunxinwei
-    password: A56sK6aW2FA3wBy2
+    password: T4xEYiwTdEmS2ZED
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a20aaa6..58b91b3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 # 端口
 server:
-  port: 9090
+  port: 9200
 # socketIo
 socketio:
   port: 9190
@@ -47,9 +47,9 @@ spring:
       max-request-size: 100MB
   redis:
     database: 7
-    host: 127.0.0.1
+    host: 1Panel-redis-CnJa
     port: 6379
-    password:
+    password: redis_xGXDip
 
   # 邮件服务器配置
   mail: