From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 server/admin/src/main/java/com/doumee/api/business/WithdrawalOrdersController.java |   55 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/server/admin/src/main/java/com/doumee/api/business/WithdrawalOrdersController.java b/server/admin/src/main/java/com/doumee/api/business/WithdrawalOrdersController.java
index 4c27823..4b5b7b2 100644
--- a/server/admin/src/main/java/com/doumee/api/business/WithdrawalOrdersController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/WithdrawalOrdersController.java
@@ -2,11 +2,11 @@
 
 import com.doumee.api.BaseController;
 import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.dao.business.model.WithdrawalOrders;
+import com.doumee.dao.dto.WithdrawalApproveDTO;
 import com.doumee.service.business.WithdrawalOrdersService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,10 +19,11 @@
 import java.util.List;
 
 /**
- * @author 姹熻箘韫�
- * @date 2025/07/09 12:00
+ * 鎻愮幇鐢宠绠＄悊
+ * @author rk
+ * @date 2026/04/10
  */
-@Api(tags = "鎻愮幇鐢宠璁板綍")
+@Api(tags = "鎻愮幇鐢宠")
 @RestController
 @RequestMapping("/business/withdrawalOrders")
 public class WithdrawalOrdersController extends BaseController {
@@ -30,17 +31,9 @@
     @Autowired
     private WithdrawalOrdersService withdrawalOrdersService;
 
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:withdrawalorders:create")
-    public ApiResponse create(@RequestBody WithdrawalOrders withdrawalOrders) {
-        return ApiResponse.success(withdrawalOrdersService.create(withdrawalOrders));
-    }
-
     @ApiOperation("鏍规嵁ID鍒犻櫎")
     @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:withdrawalorders:delete")
+    @RequiresPermissions("business:withdrawalOrders:delete")
     public ApiResponse deleteById(@PathVariable Integer id) {
         withdrawalOrdersService.deleteById(id);
         return ApiResponse.success(null);
@@ -48,9 +41,9 @@
 
     @ApiOperation("鎵归噺鍒犻櫎")
     @GetMapping("/delete/batch")
-    @RequiresPermissions("business:withdrawalorders:delete")
+    @RequiresPermissions("business:withdrawalOrders:delete")
     public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
+        String[] idArray = ids.split(",");
         List<Integer> idList = new ArrayList<>();
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
@@ -61,7 +54,7 @@
 
     @ApiOperation("鏍规嵁ID淇敼")
     @PostMapping("/updateById")
-    @RequiresPermissions("business:withdrawalorders:update")
+    @RequiresPermissions("business:withdrawalOrders:update")
     public ApiResponse updateById(@RequestBody WithdrawalOrders withdrawalOrders) {
         withdrawalOrdersService.updateById(withdrawalOrders);
         return ApiResponse.success(null);
@@ -69,22 +62,38 @@
 
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
-    @RequiresPermissions("business:withdrawalorders:query")
-    public ApiResponse<PageData<WithdrawalOrders>> findPage (@RequestBody PageWrap<WithdrawalOrders> pageWrap) {
+    @RequiresPermissions("business:withdrawalOrders:query")
+    public ApiResponse<PageData<WithdrawalOrders>> findPage(@RequestBody PageWrap<WithdrawalOrders> pageWrap) {
         return ApiResponse.success(withdrawalOrdersService.findPage(pageWrap));
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
-    @RequiresPermissions("business:withdrawalorders:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<WithdrawalOrders> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(WithdrawalOrders.class).export(withdrawalOrdersService.findPage(pageWrap).getRecords(), "鎻愮幇鐢宠璁板綍", response);
+    @RequiresPermissions("business:withdrawalOrders:exportExcel")
+    public void exportExcel(@RequestBody PageWrap<WithdrawalOrders> pageWrap, HttpServletResponse response) {
+        ExcelExporter.build(WithdrawalOrders.class).export(withdrawalOrdersService.findPage(pageWrap).getRecords(), "鎻愮幇鐢宠", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
-    @RequiresPermissions("business:withdrawalorders:query")
-    public ApiResponse findById(@PathVariable Integer id) {
+    @RequiresPermissions("business:withdrawalOrders:query")
+    public ApiResponse<WithdrawalOrders> findById(@PathVariable Integer id) {
         return ApiResponse.success(withdrawalOrdersService.findById(id));
     }
+
+    @ApiOperation("宸叉彁鐜扮粺璁￠噾棰�")
+    @PostMapping("/totalAmount")
+    @RequiresPermissions("business:withdrawalOrders:query")
+    public ApiResponse<Long> totalAmount(@RequestBody PageWrap<WithdrawalOrders> pageWrap) {
+        return ApiResponse.success(withdrawalOrdersService.totalAmount(pageWrap));
+    }
+
+    @ApiOperation("鎻愮幇瀹℃壒")
+    @PostMapping("/approve")
+    @RequiresPermissions("business:withdrawalOrders:update")
+    public ApiResponse approve(@RequestBody WithdrawalApproveDTO dto) {
+        withdrawalOrdersService.approve(dto);
+        return ApiResponse.success(null);
+    }
+
 }

--
Gitblit v1.9.3