From ddbb93dae803ea73b06bad25fb12eaa322768d18 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 09 七月 2024 19:14:19 +0800
Subject: [PATCH] 提交一把

---
 server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java |   47 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 32 insertions(+), 15 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 03e03bb..d9f5a0d 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,10 +6,10 @@
 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.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;
@@ -32,6 +32,8 @@
 
     @Autowired
     private UnionApplyService unionApplyService;
+    @Autowired
+    private InsuranceApplyService insuranceApplyService;
 
     @PreventRepeat
     @ApiOperation("鏂板缓")
@@ -83,7 +85,12 @@
     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}")
@@ -101,37 +108,47 @@
         return ApiResponse.success(unionApplyService.merge(saveUnionApplyDTO));
     }
 
-    @ApiOperation("鍏抽棴鍚堝苟鍗�")
-    @GetMapping("/close")
-    @RequiresPermissions("business:unionapply:close")
-    public ApiResponse close(@RequestParam Integer id) {
-        unionApplyService.cancelMerge(id);
+    @ApiOperation("閫�鍥炲悎骞跺崟")
+    @PostMapping("/cancel")
+    @RequiresPermissions("business:unionapply:cancel")
+    public ApiResponse close(@RequestBody CloseDTO closeDTO) {
+        unionApplyService.cancelMerge(closeDTO);
         return ApiResponse.success(null);
     }
 
     @PreventRepeat
     @ApiOperation("涓婁紶鎶曚繚鍗�")
     @PostMapping("/uploadToubaodan")
-    @RequiresPermissions("business:unionapply:create")
+    @RequiresPermissions("business:unionapply:uploadToubaodan")
     public ApiResponse uploadToubaodan(@RequestBody UploadMultifileDTO uploadMultifileDTO) {
         unionApplyService.uploadToubaodan(uploadMultifileDTO);
         return ApiResponse.success(null);
     }
 
     @ApiOperation("绛剧讲鐢宠鍗�")
-    @GetMapping("/getSignLink")
+    @PostMapping("/getSignLink")
     @RequiresPermissions("business:unionapply:query")
-    public ApiResponse getSignLink(@RequestParam Integer id) {
-        unionApplyService.getSignLink(id);
-        return ApiResponse.success(null);
+    public ApiResponse getSignLink(@RequestBody SmsCheckDTO smsCheckDTO) {
+        return ApiResponse.success( unionApplyService.getSignLink(smsCheckDTO));
     }
 
 
     @ApiOperation("涓婁紶淇濋櫓鍗�")
     @PostMapping("/uploadBXD")
-    @RequiresPermissions("business:unionchange:query")
+    @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