From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatPayNotifyAdapt.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatPayNotifyAdapt.java b/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatPayNotifyAdapt.java
index fb2abf7..f01e6c6 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatPayNotifyAdapt.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatPayNotifyAdapt.java
@@ -31,7 +31,7 @@
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.PayUtil;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -108,8 +108,15 @@
public int confirmPayFee(Map<String, Object> map) {
- String wId = map.get("wId").toString();
- wId = wId.replace(" ", "+");
+ String appId;
+ //鍏煎 娓竵浜ゆ槗鏃� 鎴栬�呭井淇℃湁鏃朵笉浼氭帀鍙傛暟鐨勯棶棰�
+ if (map.containsKey("wId")) {
+ String wId = map.get("wId").toString();
+ wId = wId.replace(" ", "+");
+ appId = WechatFactory.getAppId(wId);
+ } else {
+ appId = map.get("appid").toString();
+ }
SortedMap<String, String> paramMap = new TreeMap<String, String>();
ResponseEntity<String> responseEntity = null;
for (String key : map.keySet()) {
@@ -118,7 +125,7 @@
}
paramMap.put(key, map.get(key).toString());
}
- String appId = WechatFactory.getAppId(wId);
+ //String appId = WechatFactory.getAppId(wId);
SmallWeChatDto smallWeChatDto = getSmallWechat(appId);
if (smallWeChatDto == null) { //浠庨厤缃枃浠朵腑鑾峰彇 灏忕▼搴忛厤缃俊鎭�
--
Gitblit v1.8.0