From ccbc09cb84e4e24340f8265bf885c7f2f8320c0d Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Mon, 8 Apr 2024 10:21:15 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E9=BB=98=E8=AE=A4=E5=88=86=E8=B4=A6?=
 =?UTF-8?q?=E7=BB=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _doc/Task.md                                       |  2 +-
 .../allocation/AllocationGroupController.java      | 14 ++++++++++++++
 .../allocation/service/AllocationGroupService.java | 13 ++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

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<Void> setDefault(Long id){
+        allocationGroupService.setUpDefault(id);
+        return Res.ok();
+    }
+
+    @Operation(summary = "清除默认分账组")
+    @PostMapping("/clearDefault")
+    public ResResult<Void> 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);
+    }
+
     /**
      * 更新分账组
      */