From d339aeb296652aef7f5ab12344db75fc6588620e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 03 九月 2021 03:39:03 +0800
Subject: [PATCH] 优化代码

---
 service-front/src/main/java/com/java110/front/smo/payment/impl/ToQrPayOweFeeSMOImpl.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/service-front/src/main/java/com/java110/front/smo/payment/impl/ToQrPayOweFeeSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/payment/impl/ToQrPayOweFeeSMOImpl.java
old mode 100644
new mode 100755
index 1f94c22..4604ee6
--- a/service-front/src/main/java/com/java110/front/smo/payment/impl/ToQrPayOweFeeSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/payment/impl/ToQrPayOweFeeSMOImpl.java
@@ -10,10 +10,15 @@
 import com.java110.front.properties.WechatAuthProperties;
 import com.java110.front.smo.AppAbstractComponentSMO;
 import com.java110.front.smo.payment.IToQrPayOweFeeSMO;
+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;
@@ -27,7 +32,7 @@
 import java.math.BigDecimal;
 import java.util.Map;
 
-@Service("toPayOweFeeSMOImpl")
+@Service("toQrPayOweFeeSMOImpl")
 public class ToQrPayOweFeeSMOImpl extends AppAbstractComponentSMO implements IToQrPayOweFeeSMO {
     private static final Logger logger = LoggerFactory.getLogger(ToQrPayOweFeeSMOImpl.class);
 
@@ -94,8 +99,11 @@
         }
         money = tmpMoney.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
 
-        String openId = "";
-        Map result = super.java110Payment(outRestTemplate, "鐗╀笟浜岀淮鐮佹敹娆�", WechatAuthProperties.TRADE_TYPE_NATIVE,
+        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, "鐗╀笟浜岀淮鐮佹敹娆�", WechatAuthProperties.TRADE_TYPE_NATIVE,
                 orderId, money, "", smallWeChatDto, wechatAuthProperties.getOweFeeNotifyUrl());
         responseEntity = new ResponseEntity(JSONObject.toJSONString(result), HttpStatus.OK);
         if (!"0".equals(result.get("code"))) {
@@ -121,7 +129,7 @@
                 pd.getAppId());
         responseEntity = this.callCenterService(restTemplate, pd, "",
                 ServiceConstant.SERVICE_API_URL + "/api/smallWeChat.listSmallWeChats?communityId="
-                        + paramIn.getString("communityId") + "&page=1&row=1&weChatType=1000", HttpMethod.GET);
+                        + paramIn.getString("communityId") + "&page=1&row=1&weChatType=1100&communityId="+paramIn.getString("communityId"), HttpMethod.GET);
 
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             return null;

--
Gitblit v1.8.0