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/ToPayOweFeeSMOImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPayOweFeeSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPayOweFeeSMOImpl.java
old mode 100644
new mode 100755
index cc27c40..2768601
--- a/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPayOweFeeSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPayOweFeeSMOImpl.java
@@ -13,10 +13,15 @@
import com.java110.front.properties.WechatAuthProperties;
import com.java110.front.smo.AppAbstractComponentSMO;
import com.java110.front.smo.payment.IToPayOweFeeSMO;
+import com.java110.front.smo.payment.adapt.IPayAdapt;
import com.java110.utils.cache.CommonCache;
+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 com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -75,9 +80,14 @@
smallWeChatDto.setPayPassword(wechatAuthProperties.getKey());
}
+ String payObjType = "3333";
+ if(paramIn.containsKey("payObjType")){
+ payObjType = paramIn.getString("payObjType");
+ }
+
//鏌ヨ鐢ㄦ埛ID
paramIn.put("userId", pd.getUserId());
- String url = ServiceConstant.SERVICE_API_URL + "/api/feeApi/listOweFees?page=1&row=50&communityId=" + paramIn.getString("communityId") + "&payObjId=" + paramIn.getString("roomId") + "&payObjType=3333";
+ String url = ServiceConstant.SERVICE_API_URL + "/api/feeApi/listOweFees?page=1&row=50&communityId=" + paramIn.getString("communityId") + "&payObjId=" + paramIn.getString("roomId") + "&payObjType="+payObjType;
responseEntity = super.callCenterService(restTemplate, pd, "", url, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -125,8 +135,11 @@
JSONObject realUserInfo = userResult.getJSONArray("data").getJSONObject(0);
String openId = realUserInfo.getString("openId");
-
- Map result = super.java110Payment(outRestTemplate, paramIn.getString("feeName"), paramIn.getString("tradeType"),
+ 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,wechatAuthProperties.getOweFeeNotifyUrl());
responseEntity = new ResponseEntity(JSONObject.toJSONString(result), HttpStatus.OK);
if (!"0".equals(result.get("code"))) {
@@ -152,7 +165,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