From fe3b0f4a3c46892f08421dd4c4d0937fb8a87f93 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 06 六月 2023 17:55:10 +0800
Subject: [PATCH] 优化代码
---
service-acct/src/main/java/com/java110/acct/payment/adapt/alipay/AliPaymentFactoryAdapt.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/payment/adapt/alipay/AliPaymentFactoryAdapt.java b/service-acct/src/main/java/com/java110/acct/payment/adapt/alipay/AliPaymentFactoryAdapt.java
index 7c6fcec..7051b81 100644
--- a/service-acct/src/main/java/com/java110/acct/payment/adapt/alipay/AliPaymentFactoryAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/payment/adapt/alipay/AliPaymentFactoryAdapt.java
@@ -16,6 +16,7 @@
import com.java110.dto.app.AppDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerAppUserDto;
+import com.java110.dto.payment.NotifyPaymentOrderDto;
import com.java110.dto.payment.PaymentOrderDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.intf.fee.ITempCarFeeCreateOrderV1InnerServiceSMO;
@@ -23,6 +24,8 @@
import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
import com.java110.utils.cache.CommonCache;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.WechatConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.*;
@@ -92,7 +95,7 @@
String appId = context.getReqHeaders().get("app-id");
String userId = context.getReqHeaders().get("user-id");
String communityId = reqJson.getString("communityId");
- String notifyUrl = MappingCache.getValue("OWNER_WECHAT_URL") + "/app/payment/notify/common/992020011134400001";
+ String notifyUrl = UrlCache.getOwnerUrl()+ "/app/payment/notify/common/992020011134400001/"+smallWeChatDto.getObjId();
String openId = reqJson.getString("openId");
@@ -119,7 +122,7 @@
logger.debug("銆愬皬绋嬪簭鏀粯銆� 缁熶竴涓嬪崟寮�濮�, 璁㈠崟缂栧彿=" + paymentOrderDto.getOrderId());
SortedMap<String, String> resultMap = new TreeMap<String, String>();
//鐢熸垚鏀粯閲戦锛屽紑鍙戠幆澧冨鐞嗘敮浠橀噾棰濇暟鍒�0.01銆�0.02銆�0.03鍏�
- double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue("HC_ENV"), paymentOrderDto.getMoney());
+ double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue(MappingConstant.ENV_DOMAIN,"HC_ENV"), paymentOrderDto.getMoney());
//娣诲姞鎴栨洿鏂版敮浠樿褰�(鍙傛暟璺熻繘鑷繁涓氬姟闇�姹傛坊鍔�)
ResultVo resMap = null;
@@ -182,8 +185,8 @@
@Override
- public PaymentOrderDto java110NotifyPayment(String param) {
- JSONObject reqJson = JSONObject.parseObject(param);
+ public PaymentOrderDto java110NotifyPayment(NotifyPaymentOrderDto notifyPaymentOrderDto) {
+ JSONObject reqJson = JSONObject.parseObject(notifyPaymentOrderDto.getParam());
PaymentOrderDto paymentOrderDto = new PaymentOrderDto();
Assert.jsonObjectHaveKey(reqJson, "out_trade_no", "璇锋眰鎶ユ枃涓湭鍖呭惈璁㈠崟淇℃伅");
@@ -265,8 +268,9 @@
smallWeChatDto = new SmallWeChatDto();
smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));
smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));
- smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));
- smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));
+ smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));
+ smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));
+ smallWeChatDto.setObjId(paramIn.getString("communityId"));
return smallWeChatDto;
}
--
Gitblit v1.8.0