From 983a116ee7ac71f921aa64fdf71197655c8b4aa0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 13 八月 2025 19:01:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java
index 46c8884..0a03a4f 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java
@@ -294,8 +294,8 @@
         dataMap.put("trans_amt", money+"");
         Map<String, String> wx_data = new LinkedHashMap<String, String>(); // 使用LinkedHashMap保持顺序
         // todo
-        dataMap.put("sub_appid", wechatPayConfig.getAppId());
-        dataMap.put("sub_openid", data.getOpenId());
+        wx_data.put("sub_appid", wechatPayConfig.getAppId());
+        wx_data.put("sub_openid", data.getOpenId());
 
         dataMap.put("wx_data", wx_data);
 

--
Gitblit v1.7.1