diff --git a/_doc/Task.md b/_doc/Task.md index 9a562ce7a..8bf5e4920 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -7,7 +7,7 @@ - [x] 分账组管理 - [x] 管理 - [x] 绑定 - - [ ] 默认分账组 + - [x] 默认分账组 - [ ] 分账订单管理 - [x] 订单创建 - [ ] 发起分账 diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/allocation/AllocationGroupController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/allocation/AllocationGroupController.java index 30c05e8f3..cba937c50 100644 --- a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/allocation/AllocationGroupController.java +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/allocation/AllocationGroupController.java @@ -98,4 +98,18 @@ public class AllocationGroupController { return Res.ok(); } + @Operation(summary = "设置默认分账组") + @PostMapping("/setDefault") + public ResResult setDefault(Long id){ + allocationGroupService.setUpDefault(id); + return Res.ok(); + } + + @Operation(summary = "清除默认分账组") + @PostMapping("/clearDefault") + public ResResult clearDefault(Long id){ + allocationGroupService.clearDefault(id); + return Res.ok(); + } + } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/allocation/service/AllocationGroupService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/allocation/service/AllocationGroupService.java index b36f1c905..03d9b6887 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/allocation/service/AllocationGroupService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/allocation/service/AllocationGroupService.java @@ -104,7 +104,7 @@ public class AllocationGroupService { * 设置默认分账组 */ @Transactional(rollbackFor = Exception.class) - public void setDefault(Long id){ + public void setUpDefault(Long id){ // 分账组 AllocationGroup group = groupManager.findById(id) .orElseThrow(() -> new DataNotExistException("未找到分账组")); @@ -113,6 +113,17 @@ public class AllocationGroupService { groupManager.updateById(group); } + /** + * 清除默认分账组 + */ + @Transactional(rollbackFor = Exception.class) + public void clearDefault(Long id){ + AllocationGroup group = groupManager.findById(id) + .orElseThrow(() -> new DataNotExistException("未找到分账组")); + group.setDefaultGroup(false); + groupManager.updateById(group); + } + /** * 更新分账组 */