From c2614ad5c7d1e27fae68e52cd058af363464cdb4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 21 五月 2022 23:16:38 +0800
Subject: [PATCH] 优化代码
---
service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeWechatPaymentAdapt.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeWechatPaymentAdapt.java b/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeWechatPaymentAdapt.java
index e222d6e..9c69289 100644
--- a/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeWechatPaymentAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeWechatPaymentAdapt.java
@@ -78,7 +78,7 @@
paramMap.put("appid", shopSmallWeChatDto.getAppId());
paramMap.put("mch_id", shopSmallWeChatDto.getMchId());
paramMap.put("nonce_str", PayUtil.makeUUID(32));
- paramMap.put("body", systemName + feeName);
+ paramMap.put("body", feeName);
paramMap.put("out_trade_no", orderNum);
paramMap.put("total_fee", PayUtil.moneyToIntegerStr(payAmount));
paramMap.put("spbill_create_ip", PayUtil.getLocalIp());
@@ -111,7 +111,7 @@
if ("SUCCESS".equals(resMap.get("return_code")) && "SUCCESS".equals(resMap.get("result_code"))) {
return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
} else {
- return new ResultVo(ResultVo.CODE_ERROR, resMap.get("msg"));
+ return new ResultVo(ResultVo.CODE_ERROR, resMap.get("err_code_des"));
}
}
@@ -135,10 +135,15 @@
SortedMap<String, String> paramMap = new TreeMap<String, String>();
paramMap.put("appid", shopSmallWeChatDto.getAppId());
- paramMap.put("mch_id", shopSmallWeChatDto.getMchId());
+ paramMap.put("sub_mch_id", shopSmallWeChatDto.getMchId());
paramMap.put("nonce_str", PayUtil.makeUUID(32));
paramMap.put("out_trade_no", orderNum);
- paramMap.put("sign", PayUtil.createSign(paramMap, smallWeChatDto.getPayPassword()));
+ 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("sign", PayUtil.createSign(paramMap, shopSmallWeChatDto.getPayPassword()));
//杞崲涓簒ml
String xmlData = PayUtil.mapToXml(paramMap);
--
Gitblit v1.8.0