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/OweFeeToNotifySMOImpl.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/payment/impl/OweFeeToNotifySMOImpl.java b/service-front/src/main/java/com/java110/front/smo/payment/impl/OweFeeToNotifySMOImpl.java
old mode 100644
new mode 100755
index a8b2169..22ebb47
--- a/service-front/src/main/java/com/java110/front/smo/payment/impl/OweFeeToNotifySMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/payment/impl/OweFeeToNotifySMOImpl.java
@@ -1,7 +1,7 @@
package com.java110.front.smo.payment.impl;
-import com.java110.front.properties.WechatAuthProperties;
import com.java110.front.smo.payment.IOweFeeToNotifySMO;
+import com.java110.front.smo.payment.adapt.IOweFeeToNotifyAdapt;
import com.java110.front.smo.payment.adapt.IRentingToNotifyAdapt;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.WechatConstant;
@@ -9,11 +9,9 @@
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
import javax.servlet.http.HttpServletRequest;
@@ -25,19 +23,15 @@
private static final String DEFAULT_OWE_FEE_TO_NOTIFY_ADAPT = "wechatOweFeeToNotifyAdapt";// 榛樿寰俊閫氱敤鏀粯
- @Autowired
- private RestTemplate restTemplate;
-
- @Autowired
- private WechatAuthProperties wechatAuthProperties;
@Override
public ResponseEntity<String> toNotify(String param, HttpServletRequest request) {
+ String wId = request.getParameter("wId");
String payNotifyAdapt = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_NOTIFY_ADAPT);
payNotifyAdapt = StringUtil.isEmpty(payNotifyAdapt) ? DEFAULT_OWE_FEE_TO_NOTIFY_ADAPT : payNotifyAdapt;
//鏀粯閫傞厤鍣�
- IRentingToNotifyAdapt tPayNotifyAdapt = ApplicationContextFactory.getBean(payNotifyAdapt, IRentingToNotifyAdapt.class);
- String resXml = tPayNotifyAdapt.confirmPayFee(param);
+ IOweFeeToNotifyAdapt tPayNotifyAdapt = ApplicationContextFactory.getBean(payNotifyAdapt, IOweFeeToNotifyAdapt.class);
+ String resXml = tPayNotifyAdapt.confirmPayFee(param,wId);
logger.info("銆愬皬绋嬪簭鏀粯鍥炶皟鍝嶅簲銆� 鍝嶅簲鍐呭锛歕n" + resXml);
return new ResponseEntity<String>(resXml, HttpStatus.OK);
}
--
Gitblit v1.8.0