dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-09-09 05:49:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix 处理分账字段空指针导致的聚合支付异常

Browse Source
This commit is contained in:
DaxPay
2024-05-14 19:44:50 +08:00
parent 326755fb31
commit d83f74110f
8 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daxpay-single-demo/src/main/java/cn/daxpay/single/demo/domain/AggregatePayInfo.java
View File

@@ -19,7 +19,7 @@ public class AggregatePayInfo {
/** 订单业务号 */
@Schema(description = "订单业务号")
private String businessNo;
private String bizOrderNo;
@Schema(description = "是否分账")
private Boolean allocation;

2
daxpay-single-demo/src/main/java/cn/daxpay/single/demo/param/AggregateSimplePayParam.java
View File

@@ -18,7 +18,7 @@ import java.math.BigDecimal;
public class AggregateSimplePayParam {
@Schema(description = "业务号")
@NotNull
private String businessNo;
private String bizOrderNo;
@Schema(description = "是否分账")
private Boolean allocation;

8
daxpay-single-demo/src/main/java/cn/daxpay/single/demo/service/AggregateService.java
View File

@@ -57,7 +57,7 @@ public class AggregateService {
.intValue();
AggregatePayInfo aggregatePayInfo = new AggregatePayInfo()
.setTitle(param.getTitle())
.setBusinessNo(param.getBusinessNo())
.setBizOrderNo(param.getBizOrderNo())
.setAllocation(param.getAllocation())
.setAmount(amount);
String code = IdUtil.getSnowflakeNextIdStr();
@@ -144,7 +144,7 @@ public class AggregateService {
AggregatePayInfo aggregatePayInfo = getInfo(aggregateCode);
// 拼装支付发起参数
PayParam simplePayParam = new PayParam();
simplePayParam.setBizOrderNo(aggregatePayInfo.getBusinessNo());
simplePayParam.setBizOrderNo(aggregatePayInfo.getBizOrderNo());
simplePayParam.setTitle(aggregatePayInfo.getTitle());
simplePayParam.setAmount(aggregatePayInfo.getAmount());
simplePayParam.setChannel(PayChannelEnum.WECHAT.getCode());
@@ -178,7 +178,7 @@ public class AggregateService {
public PayOrderResult aliH5Pay(String code) {
AggregatePayInfo aggregatePayInfo = getInfo(code);
PayParam payParam = new PayParam();
payParam.setBizOrderNo(aggregatePayInfo.getBusinessNo());
payParam.setBizOrderNo(aggregatePayInfo.getBizOrderNo());
payParam.setTitle(aggregatePayInfo.getTitle());
payParam.setAmount(aggregatePayInfo.getAmount());
payParam.setChannel(PayChannelEnum.ALI.getCode());
@@ -218,7 +218,7 @@ public class AggregateService {
.intValue();
PayParam simplePayParam = new PayParam();
simplePayParam.setBizOrderNo(param.getBusinessNo());
simplePayParam.setBizOrderNo(param.getBizOrderNo());
simplePayParam.setAllocation(param.getAllocation());
simplePayParam.setTitle(param.getTitle());
simplePayParam.setAmount(amount);