From 24fd330a29f74785791c90836a70ea00a2911dc4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 16 六月 2020 18:11:53 +0800
Subject: [PATCH] 优化公众号登录问题
---
service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 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 24b9c21..f7b1c62 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,12 +1,17 @@
package com.java110.front.smo;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
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.constant.ServiceConstant;
+import com.java110.utils.exception.SMOException;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.PayUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
@@ -20,6 +25,7 @@
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
+import java.util.List;
import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -29,6 +35,22 @@
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";
+
+
/**
* 璋冪敤涓績鏈嶅姟
@@ -81,7 +103,7 @@
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 = 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)) {
@@ -129,6 +151,16 @@
paramMap.put("notify_url", wechatAuthProperties.getWxNotifyUrl());
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