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 | 7 ++++---
1 files changed, 4 insertions(+), 3 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 07bbc02..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,6 +204,7 @@
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("page", "chargingPile/payMent/payMent");
param.put("check_path", false);
@@ -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");
--
Gitblit v1.7.1