From 4816308ace36e9f20caf4255c97e96f89f3a8a32 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 20 六月 2023 16:07:33 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatPayAdapt.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatPayAdapt.java b/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatPayAdapt.java
index 29368e4..51bb587 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatPayAdapt.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/adapt/wechatPay/WechatPayAdapt.java
@@ -15,16 +15,16 @@
*/
package com.java110.api.smo.payment.adapt.wechatPay;
-import com.java110.core.factory.WechatFactory;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.api.properties.WechatAuthProperties;
import com.java110.api.smo.payment.adapt.IPayAdapt;
+import com.java110.core.factory.WechatFactory;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.wechat.SmallWeChatDto;
import com.java110.utils.cache.MappingCache;
-import com.java110.utils.constant.WechatConstant;
+import com.java110.utils.constant.MappingConstant;
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.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -94,7 +94,7 @@
logger.info("銆愬皬绋嬪簭鏀粯銆� 缁熶竴涓嬪崟寮�濮�, 璁㈠崟缂栧彿=" + orderNum);
SortedMap<String, String> resultMap = new TreeMap<String, String>();
//鐢熸垚鏀粯閲戦锛屽紑鍙戠幆澧冨鐞嗘敮浠橀噾棰濇暟鍒�0.01銆�0.02銆�0.03鍏�
- double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue("HC_ENV"), money);
+ double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue(MappingConstant.ENV_DOMAIN,"HC_ENV"), money);
//娣诲姞鎴栨洿鏂版敮浠樿褰�(鍙傛暟璺熻繘鑷繁涓氬姟闇�姹傛坊鍔�)
Map<String, String> resMap = null;
@@ -153,13 +153,17 @@
String tradeType, double payAmount, String openid,
SmallWeChatDto smallWeChatDto, String notifyUrl) throws Exception {
- String systemName = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_GOOD_NAME);
+ //String systemName = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_GOOD_NAME);
+
+ if (feeName.length() > 127) {
+ feeName = feeName.substring(0, 126);
+ }
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", 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());
--
Gitblit v1.8.0