From ab6a423cf604b83f06b5768dbc162ece744a32d9 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期五, 20 八月 2021 00:34:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java b/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java
old mode 100644
new mode 100755
index 37abb26..d81e222
--- a/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java
@@ -10,9 +10,14 @@
import com.java110.front.properties.WechatAuthProperties;
import com.java110.front.smo.AppAbstractComponentSMO;
import com.java110.front.smo.payment.IToPaySMO;
+import com.java110.front.smo.payment.adapt.IPayAdapt;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.constant.WechatConstant;
+import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +33,8 @@
@Service("toPaySMOImpl")
public class ToPaySMOImpl extends AppAbstractComponentSMO implements IToPaySMO {
private static final Logger logger = LoggerFactory.getLogger(AppAbstractComponentSMO.class);
+
+
@Autowired
@@ -82,13 +89,13 @@
}
JSONObject orderInfo = JSONObject.parseObject(responseEntity.getBody().toString());
String orderId = orderInfo.getString("oId");
- double money = Double.parseDouble(orderInfo.getString("receivableAmount"));
+ double money = Double.parseDouble(orderInfo.getString("receivedAmount"));
String appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
if (AppDto.WECHAT_OWNER_APP_ID.equals(pd.getAppId())) {
appType = OwnerAppUserDto.APP_TYPE_WECHAT;
- }else if(AppDto.WECHAT_MINA_OWNER_APP_ID.equals(pd.getAppId())){
+ } else if (AppDto.WECHAT_MINA_OWNER_APP_ID.equals(pd.getAppId())) {
appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
- }else{
+ } else {
appType = OwnerAppUserDto.APP_TYPE_APP;
}
Map tmpParamIn = new HashMap();
@@ -108,13 +115,12 @@
}
JSONObject realUserInfo = userResult.getJSONArray("data").getJSONObject(0);
-
String openId = realUserInfo.getString("openId");
-// String payAppId = orderInfo.getString("payAppId");
-// String payMchId = orderInfo.getString("payMchId");
-
-
- Map result = super.java110Payment(outRestTemplate, paramIn.getString("feeName"), paramIn.getString("tradeType"), orderId, money, openId, smallWeChatDto);
+ String payAdapt = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_ADAPT);
+ payAdapt = StringUtil.isEmpty(payAdapt) ? DEFAULT_PAY_ADAPT : payAdapt;
+ //鏀粯閫傞厤鍣�
+ IPayAdapt tPayAdapt = ApplicationContextFactory.getBean(payAdapt, IPayAdapt.class);
+ Map result = tPayAdapt.java110Payment(outRestTemplate, paramIn.getString("feeName"), paramIn.getString("tradeType"), orderId, money, openId, smallWeChatDto);
responseEntity = new ResponseEntity(JSONObject.toJSONString(result), HttpStatus.OK);
return responseEntity;
@@ -130,7 +136,7 @@
pd.getAppId());
responseEntity = this.callCenterService(restTemplate, pd, "",
ServiceConstant.SERVICE_API_URL + "/api/smallWeChat.listSmallWeChats?appId="
- + paramIn.getString("appId") + "&page=1&row=1", HttpMethod.GET);
+ + paramIn.getString("appId") + "&page=1&row=1&communityId="+paramIn.getString("communityId"), HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return null;
--
Gitblit v1.8.0