From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java b/service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java
index 7622202..8a01bd0 100644
--- a/service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java
@@ -2,32 +2,33 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.acct.payment.IPaymentFactoryAdapt;
+import com.java110.core.client.RestTemplate;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.factory.WechatFactory;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.app.AppDto;
-import com.java110.dto.onlinePay.OnlinePayDto;
+import com.java110.dto.wechat.OnlinePayDto;
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.dto.wechat.SmallWeChatDto;
import com.java110.intf.acct.IOnlinePayV1InnerServiceSMO;
import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
-import com.java110.po.onlinePay.OnlinePayPo;
+import com.java110.po.wechat.OnlinePayPo;
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.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.PayUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
import java.util.List;
import java.util.Map;
@@ -90,11 +91,11 @@
String appId = context.getReqHeaders().get("app-id");
String userId = context.getReqHeaders().get("user-id");
String tradeType = reqJson.getString("tradeType");
- String notifyUrl = MappingCache.getValue("OWNER_WECHAT_URL")+"/app/payment/notify/wechat/992020011134400001";
+ String notifyUrl = UrlCache.getOwnerUrl() + "/app/payment/notify/wechat/992020011134400001/" + smallWeChatDto.getObjId();
String openId = reqJson.getString("openId");
- if(StringUtil.isEmpty(openId)) {
+ if (StringUtil.isEmpty(openId)) {
String appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
if (AppDto.WECHAT_OWNER_APP_ID.equals(appId)) {
appType = OwnerAppUserDto.APP_TYPE_WECHAT;
@@ -109,7 +110,9 @@
ownerAppUserDto.setAppType(appType);
List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
- Assert.listOnlyOne(ownerAppUserDtos, "鏈壘鍒板紑鏀捐处鍙蜂俊鎭�");
+ if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
+ throw new IllegalArgumentException("鏈壘鍒板紑鏀捐处鍙蜂俊鎭�");
+ }
openId = ownerAppUserDtos.get(0).getOpenId();
}
@@ -117,7 +120,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());
//娣诲姞鎴栨洿鏂版敮浠樿褰�(鍙傛暟璺熻繘鑷繁涓氬姟闇�姹傛坊鍔�)
Map<String, String> resMap = null;
@@ -125,7 +128,7 @@
paymentOrderDto.getOrderId(),
tradeType,
payAmount,
- openId,
+ openId,
smallWeChatDto,
notifyUrl
);
@@ -209,14 +212,15 @@
if (responseEntity.getStatusCode() != HttpStatus.OK) {
throw new IllegalArgumentException("鏀粯澶辫触" + responseEntity.getBody());
}
- doSaveOnlinePay(smallWeChatDto,openid,orderNum,feeName,payAmount, OnlinePayDto.STATE_WAIT, "寰呮敮浠�");
+ doSaveOnlinePay(smallWeChatDto, openid, orderNum, feeName, payAmount, OnlinePayDto.STATE_WAIT, "寰呮敮浠�");
return PayUtil.xmlStrToMap(responseEntity.getBody());
}
@Override
- public PaymentOrderDto java110NotifyPayment(String param) {
+ public PaymentOrderDto java110NotifyPayment(NotifyPaymentOrderDto notifyPaymentOrderDto) {
String resXml = "";
+ String param = notifyPaymentOrderDto.getParam();
PaymentOrderDto paymentOrderDto = new PaymentOrderDto();
try {
Map<String, Object> map = PayUtil.getMapFromXML(param);
@@ -226,7 +230,7 @@
String returnmsg = (String) map.get("result_code");
if ("SUCCESS".equals(returnmsg)) {
//鏇存柊鏁版嵁
- int result = confirmPayFee(map, paymentOrderDto);
+ int result = confirmPayFee(map, paymentOrderDto, notifyPaymentOrderDto);
if (result > 0) {
//鏀粯鎴愬姛
resXml = "<xml>" + "<return_code><![CDATA[SUCCESS]]></return_code>"
@@ -251,8 +255,8 @@
return paymentOrderDto;
}
- public int confirmPayFee(Map<String, Object> map, PaymentOrderDto paymentOrderDto) {
- String appId;
+ public int confirmPayFee(Map<String, Object> map, PaymentOrderDto paymentOrderDto, NotifyPaymentOrderDto notifyPaymentOrderDto) {
+ String appId = "";
//鍏煎 娓竵浜ゆ槗鏃� 鎴栬�呭井淇℃湁鏃朵笉浼氭帀鍙傛暟鐨勯棶棰�
if (map.containsKey("wId")) {
String wId = map.get("wId").toString();
@@ -272,6 +276,7 @@
//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());
@@ -302,8 +307,10 @@
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;
}
@@ -319,7 +326,7 @@
onlinePayV1InnerServiceSMOImpl.updateOnlinePay(onlinePayPo);
}
- private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId,String feeName, double money, String state, String message) {
+ private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId, String feeName, double money, String state, String message) {
OnlinePayPo onlinePayPo = new OnlinePayPo();
onlinePayPo.setAppId(smallWeChatDto.getAppId());
onlinePayPo.setMchId(smallWeChatDto.getMchId());
--
Gitblit v1.8.0