From c5301ffe59b15a3344817b96872a1b79f87ec28e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 26 十月 2023 13:12:17 +0800
Subject: [PATCH] 优化代码
---
service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatNativeQrcodePaymentFactoryAdapt.java | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatNativeQrcodePaymentFactoryAdapt.java b/service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatNativeQrcodePaymentFactoryAdapt.java
index 70a3114..f331c3f 100644
--- a/service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatNativeQrcodePaymentFactoryAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatNativeQrcodePaymentFactoryAdapt.java
@@ -9,9 +9,11 @@
import com.java110.core.log.LoggerFactory;
import com.java110.dto.payment.NotifyPaymentOrderDto;
import com.java110.dto.payment.PaymentOrderDto;
+import com.java110.dto.paymentPoolValue.PaymentPoolValueDto;
import com.java110.dto.wechat.OnlinePayDto;
import com.java110.dto.wechat.SmallWeChatDto;
import com.java110.intf.acct.IOnlinePayV1InnerServiceSMO;
+import com.java110.intf.acct.IPaymentPoolValueV1InnerServiceSMO;
import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
import com.java110.po.wechat.OnlinePayPo;
@@ -69,18 +71,22 @@
@Autowired
private IOnlinePayV1InnerServiceSMO onlinePayV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IPaymentPoolValueV1InnerServiceSMO paymentPoolValueV1InnerServiceSMOImpl;
+
@Autowired
private RestTemplate outRestTemplate;
@Override
public Map java110Payment(PaymentOrderDto paymentOrderDto, JSONObject reqJson, ICmdDataFlowContext context) throws Exception {
SmallWeChatDto smallWeChatDto = getSmallWechat(reqJson);
-
+ String paymentPoolId = reqJson.getString("paymentPoolId");
String appId = context.getReqHeaders().get("app-id");
String userId = context.getReqHeaders().get("user-id");
- String notifyUrl = UrlCache.getOwnerUrl() + "/app/payment/notify/nativeWechat/992020011134400001/" + smallWeChatDto.getObjId();
+ String notifyUrl = UrlCache.getOwnerUrl() + "/app/payment/notify/nativeWechat/992020011134400001/" + paymentPoolId;
logger.debug("銆愬皬绋嬪簭鏀粯銆� 缁熶竴涓嬪崟寮�濮�, 璁㈠崟缂栧彿=" + paymentOrderDto.getOrderId());
SortedMap<String, String> resultMap = new TreeMap<String, String>();
@@ -94,6 +100,7 @@
TRADE_TYPE_NATIVE,
payAmount,
smallWeChatDto,
+ paymentPoolId,
notifyUrl
);
@@ -113,9 +120,23 @@
private Map<String, String> java110UnifieldOrder(String feeName, String orderNum,
String tradeType, double payAmount,
- SmallWeChatDto smallWeChatDto, String notifyUrl) throws Exception {
+ SmallWeChatDto smallWeChatDto,
+ String paymentPoolId,
+ String notifyUrl) throws Exception {
//String systemName = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_GOOD_NAME);
+
+ PaymentPoolValueDto paymentPoolValueDto = new PaymentPoolValueDto();
+ paymentPoolValueDto.setPpId(paymentPoolId);
+ List<PaymentPoolValueDto> paymentPoolValueDtos = paymentPoolValueV1InnerServiceSMOImpl.queryPaymentPoolValues(paymentPoolValueDto);
+
+ if (paymentPoolValueDtos == null || paymentPoolValueDtos.isEmpty()) {
+ throw new IllegalArgumentException("閰嶇疆閿欒,鏈厤缃弬鏁�");
+ }
+
+ String mchId = PaymentPoolValueDto.getValue(paymentPoolValueDtos, "WECHAT_MCHID");
+ String key = PaymentPoolValueDto.getValue(paymentPoolValueDtos, "WECHAT_KEY");
+
if (feeName.length() > 127) {
feeName = feeName.substring(0, 126);
@@ -123,7 +144,7 @@
SortedMap<String, String> paramMap = new TreeMap<String, String>();
paramMap.put("appid", smallWeChatDto.getAppId());
- paramMap.put("mch_id", smallWeChatDto.getMchId());
+ paramMap.put("mch_id", mchId);
paramMap.put("nonce_str", PayUtil.makeUUID(32));
paramMap.put("body", feeName);
paramMap.put("out_trade_no", orderNum);
@@ -138,7 +159,7 @@
paramMap.put("sub_appid", smallWeChatDto.getAppId());//璧疯皟灏忕▼搴廰ppid
paramMap.put("sub_mch_id", smallWeChatDto.getMchId());//璧疯皟灏忕▼搴忕殑鍟嗘埛鍙�
}
- paramMap.put("sign", PayUtil.createSign(paramMap, smallWeChatDto.getPayPassword()));
+ paramMap.put("sign", PayUtil.createSign(paramMap, key));
//杞崲涓簒ml
String xmlData = PayUtil.mapToXml(paramMap);
@@ -212,13 +233,27 @@
}
paramMap.put(key, map.get(key).toString());
}
- //String appId = WechatFactory.getAppId(wId);
- JSONObject paramIn = new JSONObject();
- paramIn.put("appId", appId);
- paramIn.put("communityId", notifyPaymentOrderDto.getCommunityId());
- SmallWeChatDto smallWeChatDto = getSmallWechat(paramIn);
- String sign = PayUtil.createSign(paramMap, smallWeChatDto.getPayPassword());
+ PaymentPoolValueDto paymentPoolValueDto = new PaymentPoolValueDto();
+ paymentPoolValueDto.setPpId(notifyPaymentOrderDto.getPaymentPoolId());
+ paymentPoolValueDto.setCommunityId(notifyPaymentOrderDto.getCommunityId());
+ List<PaymentPoolValueDto> paymentPoolValueDtos = paymentPoolValueV1InnerServiceSMOImpl.queryPaymentPoolValues(paymentPoolValueDto);
+
+ if (paymentPoolValueDtos == null || paymentPoolValueDtos.isEmpty()) {
+ throw new IllegalArgumentException("閰嶇疆閿欒,鏈厤缃弬鏁�");
+ }
+
+ // String mchId = PaymentPoolValueDto.getValue(paymentPoolValueDtos, "WECHAT_MCHID");
+ String key = PaymentPoolValueDto.getValue(paymentPoolValueDtos, "WECHAT_KEY");
+
+
+ //String appId = WechatFactory.getAppId(wId);
+// JSONObject paramIn = new JSONObject();
+// paramIn.put("appId", appId);
+// paramIn.put("communityId", notifyPaymentOrderDto.getCommunityId());
+// SmallWeChatDto smallWeChatDto = getSmallWechat(paramIn);
+
+ String sign = PayUtil.createSign(paramMap, key);
if (!sign.equals(map.get("sign"))) {
throw new IllegalArgumentException("閴存潈澶辫触");
@@ -246,8 +281,8 @@
smallWeChatDto = new SmallWeChatDto();
smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));
smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));
- smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));
- smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_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