From 0f409b25f91717e00e10c37738740b22583cb4ff Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 08 五月 2024 09:00:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/shop/src/main/java/com/doumee/api/business/UnionChangeController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 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 08d9a26..f9581af 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,6 +6,11 @@
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.UnionChangeService;
import io.swagger.annotations.Api;
@@ -85,6 +90,50 @@
@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("鍒涘缓鍚堝苟鍗�")
+ @PostMapping("/merge")
+ @RequiresPermissions("business:unionchange:create")
+ public ApiResponse merge(@RequestBody SaveUnionChangeDTO saveUnionChangeDTO) {
+ return ApiResponse.success(unionChangeService.merge(saveUnionChangeDTO));
+ }
+
+
+ @ApiOperation("鍏抽棴鍚堝苟鍗�")
+ @PostMapping("/close")
+ @RequiresPermissions("business:unionchange:close")
+ public ApiResponse close(@RequestBody CloseDTO closeDTO) {
+ unionChangeService.cancelMerge(closeDTO);
+ return ApiResponse.success(null);
+ }
+
+
+ @ApiOperation("绛剧讲鐢宠鍗�")
+ @PostMapping("/getSignLink")
+ @RequiresPermissions("business:unionchange:sign")
+ public ApiResponse getSignLink(@RequestBody SmsCheckDTO smsCheckDTO) {
+ return ApiResponse.success(unionChangeService.getSignLink(smsCheckDTO));
+ }
+
+ @ApiOperation("涓婁紶淇濋櫓鍗�")
+ @PostMapping("/uploadBXD")
+ @RequiresPermissions("business:unionchange:uploadBXD")
+ public ApiResponse uploadBXD(@RequestBody UnionChangeBXDDTO unionChangeBXDDTO) {
+ unionChangeService.uploadBXD(unionChangeBXDDTO);
+ 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