From 63aab08cd422e940bf27a6908acd0e93a4df3a5c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 六月 2025 08:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java |   78 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 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..654653e 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,7 +6,11 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.dto.*;
+import com.doumee.dao.business.model.InsuranceApply;
 import com.doumee.dao.business.model.UnionApply;
+import com.doumee.service.business.InsuranceApplyService;
 import com.doumee.service.business.UnionApplyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,6 +33,8 @@
 
     @Autowired
     private UnionApplyService unionApplyService;
+    @Autowired
+    private InsuranceApplyService insuranceApplyService;
 
     @PreventRepeat
     @ApiOperation("鏂板缓")
@@ -80,11 +86,79 @@
     public void exportExcel (@RequestBody PageWrap<UnionApply> pageWrap, HttpServletResponse response) {
         ExcelExporter.build(UnionApply.class).export(unionApplyService.findPage(pageWrap).getRecords(), "鍚堝苟鎶曚繚鍗曚俊鎭〃", response);
     }
+    @ApiOperation("瀵煎嚭鎶曚繚璇︽儏鍗�")
+    @PostMapping("/exportDetailExcel")
+    @RequiresPermissions("business:unionapply:exportExcel")
+    public void exportDetailExcel (@RequestBody UnionApply model, HttpServletResponse response) {
+        ExcelExporter.build(UnionApply.class).exportUnionApplyDetail(unionApplyService.findDetailForExport(model),  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("閫�鍥炲悎骞跺崟")
+    @PostMapping("/cancel")
+    @RequiresPermissions("business:unionapply:cancel")
+    public ApiResponse close(@RequestBody CloseDTO closeDTO) {
+        unionApplyService.cancelMerge(closeDTO);
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("鍚堝苟鍗曞瀹�")
+    @PostMapping("/reexamineCheck")
+    @RequiresPermissions("business:unionapply:cancel")
+    public ApiResponse reexamineCheck(@RequestBody UnionApply unionApply) {
+        unionApplyService.reexamineCheck(unionApply);
+        return ApiResponse.success(null);
+    }
+
+
+    @PreventRepeat
+    @ApiOperation("涓婁紶鎶曚繚鍗�")
+    @PostMapping("/uploadToubaodan")
+    @RequiresPermissions("business:unionapply:uploadToubaodan")
+    public ApiResponse uploadToubaodan(@RequestBody UploadMultifileDTO uploadMultifileDTO) {
+        unionApplyService.uploadToubaodan(uploadMultifileDTO);
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("绛剧讲鐢宠鍗�")
+    @PostMapping("/getSignLink")
+    @RequiresPermissions("business:unionapply:query")
+    public ApiResponse getSignLink(@RequestBody SmsCheckDTO smsCheckDTO) {
+        return ApiResponse.success( unionApplyService.getSignLink(smsCheckDTO));
+    }
+
+
+    @ApiOperation("涓婁紶淇濋櫓鍗�")
+    @PostMapping("/uploadBXD")
+    @RequiresPermissions("business:unionapply:uploadBXD")
+    public ApiResponse uploadBXD(@RequestBody UnionApplyBXDDTO unionApplyBXDDTO) {
+        unionApplyService.uploadBXD(unionApplyBXDDTO);
+        insuranceApplyService.updateApplyCurrentFee(null,unionApplyBXDDTO.getId());
+        unionApplyService.updateUnionApplyCurrentFee(unionApplyBXDDTO.getId());
+        return ApiResponse.success(null);
+    }
+
+
+    @ApiOperation("娴嬭瘯鍚堝苟鍗曞疄闄呴噾棰�")
+    @GetMapping("/testFee")
+    public ApiResponse testFee(Integer id) {
+        unionApplyService.updateUnionApplyCurrentFee(id);
+        return ApiResponse.success(null);
+    }
+
 }

--
Gitblit v1.9.3