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/AppAbstractComponentSMO.java | 134 --------------------------------------------
1 files changed, 2 insertions(+), 132 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java b/service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
old mode 100644
new mode 100755
index f6db5d8..6704e57
--- a/service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
+++ b/service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
@@ -25,6 +25,7 @@
public abstract class AppAbstractComponentSMO extends AbstractComponentSMO {
private static final Logger logger = LoggerFactory.getLogger(AppAbstractComponentSMO.class);
+ protected static final String DEFAULT_PAY_ADAPT = "wechatPayAdapt";// 榛樿寰俊閫氱敤鏀粯
@Autowired
private WechatAuthProperties wechatAuthProperties;
@@ -70,141 +71,10 @@
responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
logger.debug("璇锋眰鍦板潃涓�,{} 璇锋眰涓績鏈嶅姟淇℃伅锛寋},涓績鏈嶅姟杩斿洖淇℃伅锛寋}", url, httpEntity, responseEntity);
- return responseEntity;
}
-
+ return responseEntity;
}
- /**
- * 棰勪笅鍗�
- *
- * @param orderNum
- * @param money
- * @param openId
- * @return
- * @throws Exception
- */
- protected Map<String, String> java110Payment(RestTemplate outRestTemplate,
- String feeName, String tradeType,
- String orderNum, double money,
- String openId, SmallWeChatDto smallWeChatDto) throws Exception {
- return java110Payment(outRestTemplate, feeName, tradeType, orderNum, money, openId, smallWeChatDto, "");
- }
- /**
- * 棰勪笅鍗�
- *
- * @param orderNum
- * @param money
- * @param openId
- * @return
- * @throws Exception
- */
- protected Map<String, String> java110Payment(RestTemplate outRestTemplate,
- String feeName, String tradeType,
- String orderNum, double money,
- String openId, SmallWeChatDto smallWeChatDto, String notifyUrl) throws Exception {
- logger.info("銆愬皬绋嬪簭鏀粯銆� 缁熶竴涓嬪崟寮�濮�, 璁㈠崟缂栧彿=" + orderNum);
- SortedMap<String, String> resultMap = new TreeMap<String, String>();
-//鐢熸垚鏀粯閲戦锛屽紑鍙戠幆澧冨鐞嗘敮浠橀噾棰濇暟鍒�0.01銆�0.02銆�0.03鍏�
-
- double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue("HC_ENV"), money);
-//娣诲姞鎴栨洿鏂版敮浠樿褰�(鍙傛暟璺熻繘鑷繁涓氬姟闇�姹傛坊鍔�)
-
- Map<String, String> resMap = null;
-
- if (StringUtil.isEmpty(notifyUrl)) {
- resMap = this.java110UnifieldOrder(outRestTemplate, feeName, orderNum, tradeType, payAmount, openId, smallWeChatDto);
- } else {
- resMap = this.java110UnifieldOrder(outRestTemplate, feeName, orderNum, tradeType, payAmount, openId, smallWeChatDto, notifyUrl);
- }
-
- if ("SUCCESS".equals(resMap.get("return_code")) && "SUCCESS".equals(resMap.get("result_code"))) {
- if (WechatAuthProperties.TRADE_TYPE_JSAPI.equals(tradeType)) {
-
- resultMap.put("appId", smallWeChatDto.getAppId());
- resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
- resultMap.put("nonceStr", PayUtil.makeUUID(32));
- resultMap.put("package", "prepay_id=" + resMap.get("prepay_id"));
- resultMap.put("signType", "MD5");
- resultMap.put("sign", PayUtil.createSign(resultMap, smallWeChatDto.getPayPassword()));
- } else if (WechatAuthProperties.TRADE_TYPE_APP.equals(tradeType)) {
- resultMap.put("appId", smallWeChatDto.getAppId());
- resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
- resultMap.put("nonceStr", PayUtil.makeUUID(32));
- resultMap.put("partnerid", smallWeChatDto.getMchId());
- resultMap.put("prepayid", resMap.get("prepay_id"));
- //resultMap.put("signType", "MD5");
- resultMap.put("sign", PayUtil.createSign(resultMap, smallWeChatDto.getPayPassword()));
- } else if (WechatAuthProperties.TRADE_TYPE_NATIVE.equals(tradeType)) {
- resultMap.put("prepayId", resMap.get("prepay_id"));
- resultMap.put("codeUrl", resMap.get("code_url"));
- }
- resultMap.put("code", "0");
- resultMap.put("msg", "涓嬪崟鎴愬姛");
- logger.info("銆愬皬绋嬪簭鏀粯銆戠粺涓�涓嬪崟鎴愬姛锛岃繑鍥炲弬鏁�:" + resultMap);
- } else {
- resultMap.put("code", resMap.get("return_code"));
- resultMap.put("msg", resMap.get("return_msg"));
- logger.info("銆愬皬绋嬪簭鏀粯銆戠粺涓�涓嬪崟澶辫触锛屽け璐ュ師鍥�:" + resMap.get("return_msg"));
- }
- return resultMap;
- }
-
- /**
- * 灏忕▼搴忔敮浠樼粺涓�涓嬪崟
- */
- private Map<String, String> java110UnifieldOrder(RestTemplate outRestTemplate, String feeName, String orderNum,
- String tradeType, double payAmount, String openid,
- SmallWeChatDto smallWeChatDto) throws Exception {
- return java110UnifieldOrder(outRestTemplate, feeName, orderNum, tradeType, payAmount, openid, smallWeChatDto, wechatAuthProperties.getWxNotifyUrl());
- }
-
- /**
- * 灏忕▼搴忔敮浠樼粺涓�涓嬪崟
- */
- private Map<String, String> java110UnifieldOrder(RestTemplate outRestTemplate, String feeName, String orderNum,
- String tradeType, double payAmount, String openid,
- SmallWeChatDto smallWeChatDto, String notifyUrl) throws Exception {
-
- String systemName = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_GOOD_NAME);
-
- SortedMap<String, String> paramMap = new TreeMap<String, String>();
- paramMap.put("appid", smallWeChatDto.getAppId());
- paramMap.put("mch_id", smallWeChatDto.getMchId());
- paramMap.put("nonce_str", PayUtil.makeUUID(32));
- paramMap.put("body", systemName + feeName);
- paramMap.put("out_trade_no", orderNum);
- paramMap.put("total_fee", PayUtil.moneyToIntegerStr(payAmount));
- paramMap.put("spbill_create_ip", PayUtil.getLocalIp());
- paramMap.put("notify_url", notifyUrl + "?wId=" + WechatFactory.getWId(smallWeChatDto.getAppId()));
- paramMap.put("trade_type", tradeType);
- paramMap.put("openid", openid);
-
- String paySwitch = MappingCache.getValue(DOMAIN_WECHAT_PAY, WECHAT_SERVICE_PAY_SWITCH);
- if (WECHAT_SERVICE_PAY_SWITCH_ON.equals(paySwitch)) {
- paramMap.put("appid", MappingCache.getValue(DOMAIN_WECHAT_PAY, WECHAT_SERVICE_APP_ID)); //鏈嶅姟鍟哸ppid锛屾槸鏈嶅姟鍟嗘敞鍐屾椂鍏紬鍙风殑id
- paramMap.put("mch_id", MappingCache.getValue(DOMAIN_WECHAT_PAY, WECHAT_SERVICE_MCH_ID)); //鏈嶅姟鍟嗗晢鎴峰彿
- paramMap.put("sub_appid", smallWeChatDto.getAppId());//璧疯皟灏忕▼搴廰ppid
- paramMap.put("sub_mch_id", smallWeChatDto.getMchId());//璧疯皟灏忕▼搴忕殑鍟嗘埛鍙�
- paramMap.put("sub_openid", openid);
- paramMap.remove("openid");
- }
- paramMap.put("sign", PayUtil.createSign(paramMap, smallWeChatDto.getPayPassword()));
-//杞崲涓簒ml
- String xmlData = PayUtil.mapToXml(paramMap);
-
- logger.debug("璋冪敤鏀粯缁熶竴涓嬪崟鎺ュ彛" + xmlData);
-
- ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(
- wechatAuthProperties.getWxPayUnifiedOrder(), xmlData, String.class);
-
- logger.debug("缁熶竴涓嬪崟杩斿洖" + responseEntity);
-//璇锋眰寰俊鍚庡彴锛岃幏鍙栭鏀粯ID
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
- throw new IllegalArgumentException("鏀粯澶辫触" + responseEntity.getBody());
- }
- return PayUtil.xmlStrToMap(responseEntity.getBody());
- }
}
--
Gitblit v1.8.0