dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-10-13 13:20:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 回调方法参数优化

Browse Source
This commit is contained in:
bootx
2024-12-29 10:46:45 +08:00
parent 2b8d8b7ee0
commit 890a3bbf5f
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/callback/WechatPayCallbackService.java
View File

@@ -84,7 +84,7 @@ public class WechatPayCallbackService {
// 转换请求
WxPayOrderNotifyResult wxPayOrderNotifyResult = wxPayService.parseOrderNotifyResult(xml);
// 解析数据
this.resolveV2Data(wxPayOrderNotifyResult,isv);
this.resolveV2Data(wxPayOrderNotifyResult);
return true;
} catch (WxPayException e) {
log.error("微信支付回调V2处理失败", e);
@@ -105,7 +105,7 @@ public class WechatPayCallbackService {
// 转换请求
WxPayNotifyV3Result wxPayNotifyV3Result = wxPayService.parseOrderNotifyV3Result(body, signatureHeader);
// 解析数据
this.resolvePayData(wxPayNotifyV3Result,isv);
this.resolvePayData(wxPayNotifyV3Result);
} catch (WxPayException e) {
callbackInfo.setCallbackStatus(CallbackStatusEnum.FAIL);
log.error("微信支付回调V3处理失败", e);
@@ -118,7 +118,7 @@ public class WechatPayCallbackService {
/**
* 解析数据 v2
*/
private void resolveV2Data(WxPayOrderNotifyResult result, boolean isv){
private void resolveV2Data(WxPayOrderNotifyResult result){
CallbackLocal callbackInfo = PaymentContextLocal.get().getCallbackInfo();
// 回调数据
Map<String, String> map = result.toMap();
@@ -141,7 +141,7 @@ public class WechatPayCallbackService {
/**
* 解析数据 v3
*/
private void resolvePayData(WxPayNotifyV3Result v3Result, boolean isv){
private void resolvePayData(WxPayNotifyV3Result v3Result){
CallbackLocal callbackInfo = PaymentContextLocal.get().getCallbackInfo();
var result = v3Result.getResult();
// 回调数据

8
daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/callback/WechatRefundCallbackService.java
View File

@@ -86,7 +86,7 @@ public class WechatRefundCallbackService {
// 转换请求
var result = wxPayService.parseRefundNotifyResult(xml);
// 解析数据
resolveV2Data(result,isv);
resolveV2Data(result);
return true;
} catch (WxPayException e) {
callbackInfo.setCallbackStatus(CallbackStatusEnum.FAIL);
@@ -107,7 +107,7 @@ public class WechatRefundCallbackService {
// 转换请求
var result = wxPayService.parseRefundNotifyV3Result(body, signatureHeader);
// 解析数据
this.resolveV3Data(result,isv);
this.resolveV3Data(result);
return true;
} catch (WxPayException e) {
callbackInfo.setCallbackStatus(CallbackStatusEnum.FAIL);
@@ -120,7 +120,7 @@ public class WechatRefundCallbackService {
/**
* 解析数据 v2
*/
public void resolveV2Data(WxPayRefundNotifyResult notifyResult, boolean isv){
public void resolveV2Data(WxPayRefundNotifyResult notifyResult){
CallbackLocal callbackInfo = PaymentContextLocal.get().getCallbackInfo();
// 解密的数据
var result = notifyResult.getReqInfo();
@@ -155,7 +155,7 @@ public class WechatRefundCallbackService {
/**
* 解析数据 v3
*/
public void resolveV3Data(WxPayRefundNotifyV3Result v3Result, boolean isv){
public void resolveV3Data(WxPayRefundNotifyV3Result v3Result){
CallbackLocal callbackInfo = PaymentContextLocal.get().getCallbackInfo();
var result = v3Result.getResult();
// 回调数据

10
daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/callback/WechatTransferCallbackService.java
View File

@@ -64,7 +64,7 @@ public class WechatTransferCallbackService {
*/
public boolean resolve(HttpServletRequest request, boolean isv) {
CallbackLocal callbackInfo = PaymentContextLocal.get().getCallbackInfo();
callbackInfo.setChannel(ChannelEnum.WECHAT.getCode())
callbackInfo.setChannel(isv? ChannelEnum.WECHAT_ISV.getCode():ChannelEnum.WECHAT.getCode())
.setCallbackType(TradeTypeEnum.TRANSFER);
WechatPayConfig config = wechatPayConfigService.getAndCheckConfig(false);
WxPayService wxPayService = wechatPayConfigService.wxJavaSdk(config);
@@ -80,7 +80,7 @@ public class WechatTransferCallbackService {
try {
var notifyV3Result = wxPayService.baseParseOrderNotifyV3Result(body, signatureHeader, WxPayTransferBatchesNotifyV3Result.class, WxPayTransferBatchesNotifyV3Result.DecryptNotifyResult.class);
// 解析数据
this.resolveData(notifyV3Result,isv);
this.resolveData(notifyV3Result);
} catch (WxPayException e) {
callbackInfo.setCallbackStatus(CallbackStatusEnum.FAIL);
log.error("微信转账回调V3处理失败", e);
@@ -92,14 +92,10 @@ public class WechatTransferCallbackService {
/**
* 微信转账到零钱回调
*/
public void resolveData(WxPayTransferBatchesNotifyV3Result notifyV3Result, boolean isv) {
public void resolveData(WxPayTransferBatchesNotifyV3Result notifyV3Result) {
CallbackLocal callbackInfo = PaymentContextLocal.get().getCallbackInfo();
// 解析数据
var result = notifyV3Result.getResult();
// 设置类型和通道
callbackInfo.setCallbackType(TradeTypeEnum.TRANSFER)
.setChannel(ChannelEnum.WECHAT.getCode());
// 回调数据
callbackInfo.setCallbackData(BeanUtil.beanToMap(result));
// 网关转账批次号