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/UnionChangeController.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/server/shop/src/main/java/com/doumee/api/business/UnionChangeController.java b/server/shop/src/main/java/com/doumee/api/business/UnionChangeController.java
index 4432a37..04a7479 100644
--- a/server/shop/src/main/java/com/doumee/api/business/UnionChangeController.java
+++ b/server/shop/src/main/java/com/doumee/api/business/UnionChangeController.java
@@ -6,9 +6,13 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dto.CloseDTO;
import com.doumee.dao.business.dto.SaveUnionChangeDTO;
+import com.doumee.dao.business.dto.SmsCheckDTO;
import com.doumee.dao.business.dto.UnionChangeBXDDTO;
+import com.doumee.dao.business.model.UnionApply;
import com.doumee.dao.business.model.UnionChange;
+import com.doumee.service.business.InsuranceApplyService;
import com.doumee.service.business.UnionChangeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,6 +35,8 @@
@Autowired
private UnionChangeService unionChangeService;
+ @Autowired
+ private InsuranceApplyService insuranceApplyService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -87,10 +93,8 @@
@GetMapping("/{id}")
@RequiresPermissions("business:unionchange:query")
public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(unionChangeService.findById(id));
+ return ApiResponse.success(unionChangeService.getDetail(id));
}
-
-
@PreventRepeat
@ApiOperation("鍒涘缓鍚堝苟鍗�")
@@ -102,27 +106,38 @@
@ApiOperation("鍏抽棴鍚堝苟鍗�")
- @GetMapping("/close")
+ @PostMapping("/close")
@RequiresPermissions("business:unionchange:close")
- public ApiResponse close(@RequestParam Integer id) {
- unionChangeService.cancelMerge(id);
+ public ApiResponse close(@RequestBody CloseDTO closeDTO) {
+ unionChangeService.cancelMerge(closeDTO);
return ApiResponse.success(null);
}
@ApiOperation("绛剧讲鐢宠鍗�")
- @GetMapping("/getSignLink")
- @RequiresPermissions("business:unionchange:query")
- public ApiResponse getSignLink(@RequestParam Integer id) {
- unionChangeService.getSignLink(id);
- return ApiResponse.success(null);
+ @PostMapping("/getSignLink")
+ @RequiresPermissions("business:unionchange:sign")
+ public ApiResponse getSignLink(@RequestBody SmsCheckDTO smsCheckDTO) {
+ return ApiResponse.success(unionChangeService.getSignLink(smsCheckDTO));
}
@ApiOperation("涓婁紶淇濋櫓鍗�")
@PostMapping("/uploadBXD")
- @RequiresPermissions("business:unionchange:query")
+ @RequiresPermissions("business:unionchange:uploadBXD")
public ApiResponse uploadBXD(@RequestBody UnionChangeBXDDTO unionChangeBXDDTO) {
unionChangeService.uploadBXD(unionChangeBXDDTO);
+ insuranceApplyService.updateApplyCurrentFee(null,unionChangeBXDDTO.getApplyId());
return ApiResponse.success(null);
}
+
+
+ @ApiOperation("瀵煎嚭鎶曚繚璇︽儏鍗�")
+ @PostMapping("/exportDetailExcel")
+ @RequiresPermissions("business:unionchange:exportExcel")
+ public void exportDetailExcel (@RequestBody UnionChange model, HttpServletResponse response) {
+ ExcelExporter.build(UnionChange.class).exportUnionChangeDetail(unionChangeService.unionChangeDetail(model.getId()), response);
+ }
+
+
+
}
--
Gitblit v1.9.3