From e85d80650f2e9908cdfd5d873ece182273538622 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 29 三月 2023 23:06:56 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeMoneyAdapt.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeMoneyAdapt.java b/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeMoneyAdapt.java
index 2f3fdff..34e2600 100644
--- a/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeMoneyAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeMoneyAdapt.java
@@ -121,13 +121,18 @@
List<SmallWeChatDto> smallWeChatDtos = smallWechatV1InnerServiceSMOImpl.querySmallWechats(smallWeChatDto);
if (smallWeChatDto == null || smallWeChatDtos.size() <= 0) {
payPassword = MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key");
- certData = MappingCache.getRemark(WechatConstant.WECHAT_DOMAIN, "cert");
+ certData = MappingCache.getRemark(MappingConstant.WECHAT_STORE_DOMAIN, "cert");
mchPassword = MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId");
} else {
payPassword = smallWeChatDtos.get(0).getPayPassword();
certData = smallWeChatDtos.get(0).getCertPath();
mchPassword = smallWeChatDtos.get(0).getMchId();
+ if(StringUtil.isEmpty(certData)){
+ certData = MappingCache.getRemark(MappingConstant.WECHAT_STORE_DOMAIN, "cert");
+ }
}
+
+
SortedMap<String, String> parameters = new TreeMap<String, String>();
String paySwitch = MappingCache.getValue(DOMAIN_WECHAT_PAY, WECHAT_SERVICE_PAY_SWITCH);
parameters.put("appid", onlinePayDtos.get(0).getAppId());//appid
--
Gitblit v1.8.0