From 324ed9fac852bc4117ee0da65a586adef258bd52 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 11:08:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 6b640bf..ca688d6 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
@@ -204,8 +204,9 @@
         try {
             String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken;
             Map<String, Object> param = new HashMap<>();
+//            param.put("scene", "phone=" + phonenumber);
             param.put("scene", "phone=" + phonenumber+",amount="+amount);
-            param.put("path", "chargingPile/payMent/payMent");
+            param.put("page", "chargingPile/payMent/payMent");
             param.put("check_path", false);
             param.put("env_version", "trial");
             param.put("width", 200); //二维码尺寸
@@ -288,7 +289,7 @@
         Map<String, Object> dataMap = new LinkedHashMap<String, Object>(); // 使用LinkedHashMap保持顺序
         dataMap.put("goods_desc", "积分充值");
         dataMap.put("huifu_id", "6666000174575407");
-        dataMap.put("notify_url", "http://221.182.45.100:8084/other/wx/integralCallback");
+        dataMap.put("notify_url", "http://47.120.5.122:8080/other/wx/integralCallback");
         dataMap.put("req_date", date.format(new Date()));
         dataMap.put("req_seq_id", code);
         dataMap.put("trade_type", "T_MINIAPP");
@@ -402,7 +403,7 @@
         Map<String, Object> dataMap = new LinkedHashMap<String, Object>(); // 使用LinkedHashMap保持顺序
         dataMap.put("goods_desc", "积分充值");
         dataMap.put("huifu_id", "6666000174575407");
-        dataMap.put("notify_url", "http://221.182.45.100:8084/other/wx/integralCallback");
+        dataMap.put("notify_url", "http://47.120.5.122:8080/other/wx/integralCallback");
         dataMap.put("req_date", date.format(new Date()));
         dataMap.put("req_seq_id", code);
         dataMap.put("trade_type", "T_MINIAPP");
@@ -489,7 +490,7 @@
         Map<String, Object> dataMap = new LinkedHashMap<String, Object>(); // 使用LinkedHashMap保持顺序
         dataMap.put("goods_desc", "积分充值");
         dataMap.put("huifu_id", "6666000174575407");
-        dataMap.put("notify_url", "http://221.182.45.100:8084/other/wx/integralCallback");
+        dataMap.put("notify_url", "http://47.120.5.122:8080/other/wx/integralCallback");
         dataMap.put("req_date", date.format(new Date()));
         dataMap.put("req_seq_id", code);
         dataMap.put("trade_type", "T_JSAPI");
@@ -505,6 +506,7 @@
 
         String signStr = JSON.toJSONString(JSONObject.parseObject(JSON.toJSONString(dataMap), TreeMap.class));
 
+
         System.out.println("待签名字符串:" + signStr);
 
         // 签名 (按照汇付天下规则,使用MD5加签)

--
Gitblit v1.7.1