From bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 19:19:01 +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 | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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..53c3996 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,7 +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.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.UnionChange;
import com.doumee.service.business.UnionChangeService;
@@ -87,10 +89,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,19 +102,19 @@
@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")
+ @PostMapping("/getSignLink")
@RequiresPermissions("business:unionchange:query")
- public ApiResponse getSignLink(@RequestParam Integer id) {
- unionChangeService.getSignLink(id);
+ public ApiResponse getSignLink(@RequestBody SmsCheckDTO smsCheckDTO) {
+ unionChangeService.getSignLink(smsCheckDTO);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3