From e5cef041931401a6d0955d46163d5b2f7b65e091 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 11 十二月 2020 00:19:26 +0800
Subject: [PATCH] 优化二维码生成
---
service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 10 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 bc78773..f6db5d8 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
@@ -2,21 +2,19 @@
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.core.factory.WechatFactory;
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.constant.WechatConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.PayUtil;
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.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
@@ -29,6 +27,21 @@
private static final Logger logger = LoggerFactory.getLogger(AppAbstractComponentSMO.class);
@Autowired
private WechatAuthProperties wechatAuthProperties;
+
+ @Autowired
+ private RestTemplate restTemplate;
+
+ //寰俊鏀粯
+ public static final String DOMAIN_WECHAT_PAY = "WECHAT_PAY";
+ // 寰俊鏈嶅姟鍟嗘敮浠樺紑鍏�
+ public static final String WECHAT_SERVICE_PAY_SWITCH = "WECHAT_SERVICE_PAY_SWITCH";
+ //寮�鍏砄N鎵撳紑
+ public static final String WECHAT_SERVICE_PAY_SWITCH_ON = "ON";
+
+ private static final String WECHAT_SERVICE_APP_ID = "SERVICE_APP_ID";
+
+ private static final String WECHAT_SERVICE_MCH_ID = "SERVICE_MCH_ID";
+
/**
* 璋冪敤涓績鏈嶅姟
@@ -46,6 +59,7 @@
header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), pd.getTransactionId());
header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), pd.getRequestTime());
header.add(CommonConstant.HTTP_SIGN.toLowerCase(), "");
+ header.add("content-type", "application/json");
HttpEntity<String> httpEntity = new HttpEntity<String>(param, header);
//logger.debug("璇锋眰涓績鏈嶅姟淇℃伅锛寋}", httpEntity);
try {
@@ -74,6 +88,22 @@
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鍏�
@@ -81,16 +111,23 @@
double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue("HC_ENV"), money);
//娣诲姞鎴栨洿鏂版敮浠樿褰�(鍙傛暟璺熻繘鑷繁涓氬姟闇�姹傛坊鍔�)
- Map<String, String> resMap = this.java110UnifieldOrder(outRestTemplate, feeName, orderNum, tradeType, payAmount, openId,smallWeChatDto);
+ 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("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");
+ 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());
@@ -99,6 +136,9 @@
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", "涓嬪崟鎴愬姛");
@@ -117,18 +157,39 @@
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", "HC鏅烘収瀹跺洯-" + feeName);
+ 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", wechatAuthProperties.getWxNotifyUrl());
+ 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);
--
Gitblit v1.8.0