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 | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 462fee0..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
@@ -9,10 +9,11 @@
import com.java110.utils.util.PayUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@@ -22,6 +23,7 @@
/**
* 寰俊鏀粯
*/
+@Service
public class QrCodeWechatPaymentAdapt implements IQrCodePaymentSMO {
private static Logger logger = LoggerFactory.getLogger(QrCodeWechatPaymentAdapt.class);
@@ -76,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());
@@ -86,11 +88,11 @@
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_appid", shopSmallWeChatDto.getAppId());//璧疯皟灏忕▼搴廰ppid
+ paramMap.put("sub_mch_id", shopSmallWeChatDto.getMchId());//璧疯皟灏忕▼搴忕殑鍟嗘埛鍙�
paramMap.remove("openid");
}
- paramMap.put("sign", PayUtil.createSign(paramMap, smallWeChatDto.getPayPassword()));
+ paramMap.put("sign", PayUtil.createSign(paramMap, shopSmallWeChatDto.getPayPassword()));
//杞崲涓簒ml
String xmlData = PayUtil.mapToXml(paramMap);
@@ -109,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"));
}
}
@@ -133,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