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

feat SDK分账接口联调, 修改菜单关键词字段, 添加PGSQL脚本数据

Browse Source
This commit is contained in:
bootx
2024-06-01 18:11:11 +08:00
parent 73e43115ad
commit 408c231f79
48 changed files with 6076 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/allocation/service/AllocationReceiverService.java
View File

@@ -144,7 +144,7 @@ public class AllocationReceiverService {
AllocationReceiver receiver = allocationReceiverManager.findByReceiverNo(param.getReceiverNo())
.orElseThrow(() -> new PayFailureException("该接收方不存在"));
if (groupReceiverManager.isUsed(receiver.getId())){
throw new PayFailureException("该接收方已被使用删除");
throw new PayFailureException("该接收方已被使用，无法被删除");
}
// 获取策略
PayChannelEnum channelEnum = PayChannelEnum.findByCode(receiver.getChannel());

4
daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/allocation/service/AllocationService.java
View File

@@ -111,6 +111,7 @@ public class AllocationService {
if (Objects.equals(order.getStatus(),AllocOrderStatusEnum.IGNORE.getCode())){
return new AllocationResult()
.setAllocationNo(order.getAllocationNo())
.setBizAllocationNo(order.getBizAllocationNo())
.setStatus(order.getStatus());
}
@@ -140,6 +141,7 @@ public class AllocationService {
allocationOrderManager.updateById(order);
return new AllocationResult()
.setAllocationNo(order.getAllocationNo())
.setBizAllocationNo(order.getBizAllocationNo())
.setStatus(order.getStatus());
} finally {
lockTemplate.releaseLock(lock);
@@ -188,6 +190,7 @@ public class AllocationService {
allocationOrderManager.updateById(order);
return new AllocationResult()
.setAllocationNo(order.getAllocationNo())
.setBizAllocationNo(order.getBizAllocationNo())
.setStatus(order.getStatus());
} finally {
lockTemplate.releaseLock(lock);
@@ -241,6 +244,7 @@ public class AllocationService {
allocationOrderManager.updateById(allocationOrder);
return new AllocationResult()
.setAllocationNo(allocationOrder.getAllocationNo())
.setBizAllocationNo(allocationOrder.getBizAllocationNo())
.setStatus(allocationOrder.getStatus());
}