From 22651ce6313b3617b8713f11cefffaa4f9158590 Mon Sep 17 00:00:00 2001
From: 15178832520 <121184950@qq.com>
Date: 星期一, 08 六月 2020 11:07:29 +0800
Subject: [PATCH] 调整支付接口
---
service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 f721149..c23e786 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
@@ -69,7 +69,10 @@
* @return
* @throws Exception
*/
- protected Map<String, String> java110Payment(RestTemplate outRestTemplate,String feeName, String tradeType,String orderNum, double money, String openId) throws Exception {
+ protected Map<String, String> java110Payment(RestTemplate outRestTemplate,
+ String feeName, String tradeType,
+ String orderNum, double money,
+ String openId,String payAppId,String payMchId) throws Exception {
logger.info("銆愬皬绋嬪簭鏀粯銆� 缁熶竴涓嬪崟寮�濮�, 璁㈠崟缂栧彿=" + orderNum);
SortedMap<String, String> resultMap = new TreeMap<String, String>();
//鐢熸垚鏀粯閲戦锛屽紑鍙戠幆澧冨鐞嗘敮浠橀噾棰濇暟鍒�0.01銆�0.02銆�0.03鍏�
@@ -80,12 +83,20 @@
Map<String, String> resMap = this.java110UnifieldOrder(outRestTemplate,feeName, orderNum, tradeType, payAmount, openId);
if ("SUCCESS".equals(resMap.get("return_code")) && "SUCCESS".equals(resMap.get("result_code"))) {
if(WechatAuthProperties.TRADE_TYPE_JSAPI.equals(tradeType)) {
- resultMap.put("appId", wechatAuthProperties.getAppId());
+ 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()));
+ }
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, wechatAuthProperties.getKey()));
}else if(WechatAuthProperties.TRADE_TYPE_APP.equals(tradeType)){
resultMap.put("appId", wechatAuthProperties.getAppId());
resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
--
Gitblit v1.8.0