From 3b13fd51fe6f14902b8e0f1d3611150b31545c8b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 12 六月 2020 08:48:00 +0800
Subject: [PATCH] 优化业主版支付问题
---
service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 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
index c23e786..bc78773 100644
--- a/service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
+++ b/service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
@@ -1,8 +1,9 @@
package com.java110.front.smo;
-import com.java110.front.properties.WechatAuthProperties;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.front.properties.WechatAuthProperties;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.util.Assert;
@@ -50,7 +51,7 @@
try {
responseEntity = restTemplate.exchange(url, httpMethod, httpEntity, String.class);
} catch (HttpStatusCodeException e) { //杩欓噷spring 妗嗘灦 鍦�4XX 鎴� 5XX 鏃舵姏鍑� HttpServerErrorException 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
- responseEntity = new ResponseEntity<String>( e.getResponseBodyAsString(), e.getStatusCode());
+ responseEntity = new ResponseEntity<String>(e.getResponseBodyAsString(), e.getStatusCode());
} catch (Exception e) {
responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
@@ -72,7 +73,7 @@
protected Map<String, String> java110Payment(RestTemplate outRestTemplate,
String feeName, String tradeType,
String orderNum, double money,
- String openId,String payAppId,String payMchId) throws Exception {
+ String openId, SmallWeChatDto smallWeChatDto) throws Exception {
logger.info("銆愬皬绋嬪簭鏀粯銆� 缁熶竴涓嬪崟寮�濮�, 璁㈠崟缂栧彿=" + orderNum);
SortedMap<String, String> resultMap = new TreeMap<String, String>();
//鐢熸垚鏀粯閲戦锛屽紑鍙戠幆澧冨鐞嗘敮浠橀噾棰濇暟鍒�0.01銆�0.02銆�0.03鍏�
@@ -80,31 +81,24 @@
double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue("HC_ENV"), money);
//娣诲姞鎴栨洿鏂版敮浠樿褰�(鍙傛暟璺熻繘鑷繁涓氬姟闇�姹傛坊鍔�)
- Map<String, String> resMap = this.java110UnifieldOrder(outRestTemplate,feeName, orderNum, tradeType, payAmount, openId);
+ Map<String, String> resMap = this.java110UnifieldOrder(outRestTemplate, feeName, orderNum, tradeType, payAmount, openId,smallWeChatDto);
if ("SUCCESS".equals(resMap.get("return_code")) && "SUCCESS".equals(resMap.get("result_code"))) {
- if(WechatAuthProperties.TRADE_TYPE_JSAPI.equals(tradeType)) {
- if(payAppId != null){
- resultMap.put("appId", payAppId);
- }else{
- resultMap.put("appId", wechatAuthProperties.getAppId());
- }
- if(payMchId != null){
- resultMap.put("sign", PayUtil.createSign(resultMap, payMchId));
- }else{
- resultMap.put("sign", PayUtil.createSign(resultMap, wechatAuthProperties.getKey()));
- }
+ if (WechatAuthProperties.TRADE_TYPE_JSAPI.equals(tradeType)) {
+
+ resultMap.put("appId", smallWeChatDto.getAppId());
+ resultMap.put("sign", PayUtil.createSign(resultMap, smallWeChatDto.getPayPassword()));
resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
resultMap.put("nonceStr", PayUtil.makeUUID(32));
resultMap.put("package", "prepay_id=" + resMap.get("prepay_id"));
resultMap.put("signType", "MD5");
- }else if(WechatAuthProperties.TRADE_TYPE_APP.equals(tradeType)){
- resultMap.put("appId", wechatAuthProperties.getAppId());
+ } 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", wechatAuthProperties.getMchId());
+ resultMap.put("partnerid", smallWeChatDto.getMchId());
resultMap.put("prepayid", resMap.get("prepay_id"));
//resultMap.put("signType", "MD5");
- resultMap.put("sign", PayUtil.createSign(resultMap, wechatAuthProperties.getKey()));
+ resultMap.put("sign", PayUtil.createSign(resultMap, smallWeChatDto.getPayPassword()));
}
resultMap.put("code", "0");
resultMap.put("msg", "涓嬪崟鎴愬姛");
@@ -120,11 +114,13 @@
/**
* 灏忕▼搴忔敮浠樼粺涓�涓嬪崟
*/
- private Map<String, String> java110UnifieldOrder(RestTemplate outRestTemplate, String feeName, String orderNum, String tradeType, double payAmount, String openid) throws Exception {
+ private Map<String, String> java110UnifieldOrder(RestTemplate outRestTemplate, String feeName, String orderNum,
+ String tradeType, double payAmount, String openid,
+ SmallWeChatDto smallWeChatDto) throws Exception {
//灏佽鍙傛暟
SortedMap<String, String> paramMap = new TreeMap<String, String>();
- paramMap.put("appid", wechatAuthProperties.getAppId());
- paramMap.put("mch_id", wechatAuthProperties.getMchId());
+ paramMap.put("appid", smallWeChatDto.getAppId());
+ paramMap.put("mch_id", smallWeChatDto.getMchId());
paramMap.put("nonce_str", PayUtil.makeUUID(32));
paramMap.put("body", "HC鏅烘収瀹跺洯-" + feeName);
paramMap.put("out_trade_no", orderNum);
@@ -133,7 +129,7 @@
paramMap.put("notify_url", wechatAuthProperties.getWxNotifyUrl());
paramMap.put("trade_type", tradeType);
paramMap.put("openid", openid);
- paramMap.put("sign", PayUtil.createSign(paramMap, wechatAuthProperties.getKey()));
+ paramMap.put("sign", PayUtil.createSign(paramMap, smallWeChatDto.getPayPassword()));
//杞崲涓簒ml
String xmlData = PayUtil.mapToXml(paramMap);
--
Gitblit v1.8.0