From 2b88f76c533a2fa94cd029b8a88c2d4da437552c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 29 三月 2024 08:55:22 +0800
Subject: [PATCH] git ch

---
 server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java |   51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java b/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java
index 7e39a97..03e03bb 100644
--- a/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java
+++ b/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java
@@ -6,6 +6,9 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dto.SaveUnionApplyDTO;
+import com.doumee.dao.business.dto.UnionApplyBXDDTO;
+import com.doumee.dao.business.dto.UploadMultifileDTO;
 import com.doumee.dao.business.model.UnionApply;
 import com.doumee.service.business.UnionApplyService;
 import io.swagger.annotations.Api;
@@ -81,10 +84,54 @@
         ExcelExporter.build(UnionApply.class).export(unionApplyService.findPage(pageWrap).getRecords(), "鍚堝苟鎶曚繚鍗曚俊鎭〃", response);
     }
 
+
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
     @RequiresPermissions("business:unionapply:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(unionApplyService.findById(id));
+    public ApiResponse<UnionApply> findById(@PathVariable Integer id) {
+        return ApiResponse.success(unionApplyService.detail(id));
+    }
+
+
+    @PreventRepeat
+    @ApiOperation("鍒涘缓鍚堝苟鍗�")
+    @PostMapping("/merge")
+    @RequiresPermissions("business:unionapply:create")
+    public ApiResponse merge(@RequestBody SaveUnionApplyDTO saveUnionApplyDTO) {
+        return ApiResponse.success(unionApplyService.merge(saveUnionApplyDTO));
+    }
+
+    @ApiOperation("鍏抽棴鍚堝苟鍗�")
+    @GetMapping("/close")
+    @RequiresPermissions("business:unionapply:close")
+    public ApiResponse close(@RequestParam Integer id) {
+        unionApplyService.cancelMerge(id);
+        return ApiResponse.success(null);
+    }
+
+    @PreventRepeat
+    @ApiOperation("涓婁紶鎶曚繚鍗�")
+    @PostMapping("/uploadToubaodan")
+    @RequiresPermissions("business:unionapply:create")
+    public ApiResponse uploadToubaodan(@RequestBody UploadMultifileDTO uploadMultifileDTO) {
+        unionApplyService.uploadToubaodan(uploadMultifileDTO);
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("绛剧讲鐢宠鍗�")
+    @GetMapping("/getSignLink")
+    @RequiresPermissions("business:unionapply:query")
+    public ApiResponse getSignLink(@RequestParam Integer id) {
+        unionApplyService.getSignLink(id);
+        return ApiResponse.success(null);
+    }
+
+
+    @ApiOperation("涓婁紶淇濋櫓鍗�")
+    @PostMapping("/uploadBXD")
+    @RequiresPermissions("business:unionchange:query")
+    public ApiResponse uploadBXD(@RequestBody UnionApplyBXDDTO unionApplyBXDDTO) {
+        unionApplyService.uploadBXD(unionApplyBXDDTO);
+        return ApiResponse.success(null);
     }
 }

--
Gitblit v1.9.3