From 609a1931953b2298016bd2b0d6b410666b5ad7b9 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 02 七月 2026 09:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0.1' into 3.0.1
---
server/platform/src/main/java/com/doumee/api/business/DiscountMemberController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/DiscountMemberController.java b/server/platform/src/main/java/com/doumee/api/business/DiscountMemberController.java
index c429612..581578e 100644
--- a/server/platform/src/main/java/com/doumee/api/business/DiscountMemberController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/DiscountMemberController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.DiscountMember;
+import com.doumee.dao.business.web.request.DiscountMemberDTO;
import com.doumee.service.business.DiscountMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -84,7 +85,25 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:discountmember:query")
- public ApiResponse findById(@PathVariable String id) {
- return ApiResponse.success(discountMemberService.findById(id));
+ public ApiResponse<DiscountMember> findById(@PathVariable String id) {
+ return ApiResponse.success(discountMemberService.getDetail(id));
}
+
+ @ApiOperation("濂楅鍗℃姤搴�")
+ @PostMapping("/cancel")
+ @RequiresPermissions("business:discountmember:update")
+ public ApiResponse cancel(@RequestBody DiscountMemberDTO model) {
+ discountMemberService.cancel(model);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("濂楅鍗¤皟鏁�")
+ @PostMapping("/adjust")
+ @RequiresPermissions("business:discountmember:update")
+ public ApiResponse adjust(@RequestBody DiscountMemberDTO model) {
+ discountMemberService.adjust(model);
+ return ApiResponse.success(null);
+ }
+
+
}
--
Gitblit v1.9.3