From acb14e4abc643f05dd641b2b08e2b449132dfce2 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 23 十二月 2020 08:54:31 +0800
Subject: [PATCH] 优化 相关代码
---
service-front/src/main/java/com/java110/front/smo/payment/impl/RentingToNotifySMOImpl.java | 129 ++++--------------------------------------
1 files changed, 14 insertions(+), 115 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/payment/impl/RentingToNotifySMOImpl.java b/service-front/src/main/java/com/java110/front/smo/payment/impl/RentingToNotifySMOImpl.java
index 955e891..f0f5f7d 100644
--- a/service-front/src/main/java/com/java110/front/smo/payment/impl/RentingToNotifySMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/payment/impl/RentingToNotifySMOImpl.java
@@ -1,33 +1,31 @@
package com.java110.front.smo.payment.impl;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.rentingPool.RentingPoolDto;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.front.properties.WechatAuthProperties;
import com.java110.front.smo.AppAbstractComponentSMO;
import com.java110.front.smo.payment.IRentingToNotifySMO;
-import com.java110.utils.cache.CommonCache;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ServiceConstant;
-import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.PayUtil;
+import com.java110.front.smo.payment.adapt.IRentingToNotifyAdapt;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.WechatConstant;
+import com.java110.utils.factory.ApplicationContextFactory;
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.*;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
-import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
import javax.servlet.http.HttpServletRequest;
-import java.util.*;
@Service("rentingToNotifySMOImpl")
public class RentingToNotifySMOImpl implements IRentingToNotifySMO {
private static final Logger logger = LoggerFactory.getLogger(AppAbstractComponentSMO.class);
private static final String APP_ID = "992020011134400001";
+
+
+ private static final String DEFAULT_RENTING_TO_NOTIFY_ADAPT = "wechatRentingToNotifyAdapt";// 榛樿寰俊閫氱敤鏀粯
@Autowired
@@ -38,113 +36,14 @@
@Override
public ResponseEntity<String> toNotify(String param, HttpServletRequest request) {
- String resXml = "";
- ResponseEntity responseEntity = null;
- try {
-
- Map<String, Object> map = PayUtil.getMapFromXML(param);
- logger.info("銆愬皬绋嬪簭鏀粯鍥炶皟銆� 鍥炶皟鏁版嵁锛� \n" + map);
- String returnCode = (String) map.get("return_code");
- if ("SUCCESS".equalsIgnoreCase(returnCode)) {
- String returnmsg = (String) map.get("result_code");
- if ("SUCCESS".equals(returnmsg)) {
- //鏇存柊鏁版嵁
- int result = confirmPayFee(map);
- if (result > 0) {
- //鏀粯鎴愬姛
- resXml = "<xml>" + "<return_code><![CDATA[SUCCESS]]></return_code>"
- + "<return_msg><![CDATA[OK]]></return_msg>" + "</xml>";
- }
- } else {
- resXml = "<xml>" + "<return_code><![CDATA[FAIL]]></return_code>"
- + "<return_msg><![CDATA[鎶ユ枃涓虹┖]></return_msg>" + "</xml>";
- logger.info("鏀粯澶辫触:" + resXml);
- }
- } else {
- resXml = "<xml>" + "<return_code><![CDATA[FAIL]]></return_code>"
- + "<return_msg><![CDATA[鎶ユ枃涓虹┖]></return_msg>" + "</xml>";
- logger.info("銆愯鍗曟敮浠樺け璐ャ��");
- }
- } catch (Exception e) {
- logger.error("閫氱煡澶辫触", e);
- resXml = "<xml>" + "<return_code><![CDATA[FAIL]]></return_code>"
- + "<return_msg><![CDATA[閴存潈澶辫触]></return_msg>" + "</xml>";
- }
-
+ String payNotifyAdapt = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_NOTIFY_ADAPT);
+ payNotifyAdapt = StringUtil.isEmpty(payNotifyAdapt) ? DEFAULT_RENTING_TO_NOTIFY_ADAPT : payNotifyAdapt;
+ //鏀粯閫傞厤鍣�
+ IRentingToNotifyAdapt tPayNotifyAdapt = ApplicationContextFactory.getBean(payNotifyAdapt, IRentingToNotifyAdapt.class);
+ String resXml = tPayNotifyAdapt.confirmPayFee(param);
logger.info("銆愬皬绋嬪簭鏀粯鍥炶皟鍝嶅簲銆� 鍝嶅簲鍐呭锛歕n" + resXml);
return new ResponseEntity<String>(resXml, HttpStatus.OK);
}
- public int confirmPayFee(Map<String, Object> map) {
- String wId = map.get("wId").toString();
- wId = wId.replace(" ", "+");
- SortedMap<String, String> paramMap = new TreeMap<String, String>();
- ResponseEntity<String> responseEntity = null;
- for (String key : map.keySet()) {
- if ("wId".equals(key)) {
- continue;
- }
- paramMap.put(key, map.get(key).toString());
- }
- //String appId = WechatFactory.getAppId(wId);
- SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
- smallWeChatDto.setAppId(wechatAuthProperties.getAppId());
- smallWeChatDto.setAppSecret(wechatAuthProperties.getSecret());
- smallWeChatDto.setMchId(wechatAuthProperties.getMchId());
- smallWeChatDto.setPayPassword(wechatAuthProperties.getKey());
- String sign = PayUtil.createSign(paramMap, smallWeChatDto.getPayPassword());
-
- if (!sign.equals(map.get("sign"))) {
- throw new IllegalArgumentException("閴存潈澶辫触");
- }
-
- String orderId = map.get("out_trade_no").toString();
- String order = CommonCache.getAndRemoveValue(RentingPoolDto.REDIS_PAY_RENTING + orderId);
-
- if (StringUtil.isEmpty(order)) {
- return 1;// 璇存槑宸茬粡澶勭悊杩囦簡 鍐嶄笉澶勭悊
- }
-
- //鏌ヨ鐢ㄦ埛ID
- JSONObject paramIn = JSONObject.parseObject(order);
- paramIn.put("oId", orderId);
- String url = ServiceConstant.SERVICE_API_URL + "/api/fee.rentingPayFeeConfirm";
- responseEntity = this.callCenterService(restTemplate, "-1", paramIn.toJSONString(), url, HttpMethod.POST);
-
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
- return 0;
- }
- return 1;
- }
-
-
- /**
- * 璋冪敤涓績鏈嶅姟
- *
- * @return
- */
- protected ResponseEntity<String> callCenterService(RestTemplate restTemplate, String userId, String param, String url, HttpMethod httpMethod) {
-
- ResponseEntity<String> responseEntity = null;
- HttpHeaders header = new HttpHeaders();
- header.add(CommonConstant.HTTP_APP_ID.toLowerCase(), APP_ID);
- header.add(CommonConstant.HTTP_USER_ID.toLowerCase(), userId);
- header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), UUID.randomUUID().toString());
- header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), DateUtil.getDefaultFormateTimeString(new Date()));
- header.add(CommonConstant.HTTP_SIGN.toLowerCase(), "");
- HttpEntity<String> httpEntity = new HttpEntity<String>(param, header);
- //logger.debug("璇锋眰涓績鏈嶅姟淇℃伅锛寋}", httpEntity);
- try {
- responseEntity = restTemplate.exchange(url, httpMethod, httpEntity, String.class);
- } catch (HttpStatusCodeException e) { //杩欓噷spring 妗嗘灦 鍦�4XX 鎴� 5XX 鏃舵姏鍑� HttpServerErrorException 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
- responseEntity = new ResponseEntity<String>(e.getResponseBodyAsString(), e.getStatusCode());
- } catch (Exception e) {
- responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
- } finally {
- logger.debug("璇锋眰鍦板潃涓�,{} 璇锋眰涓績鏈嶅姟淇℃伅锛寋},涓績鏈嶅姟杩斿洖淇℃伅锛寋}", url, httpEntity, responseEntity);
- return responseEntity;
- }
-
- }
}
--
Gitblit v1.8.0