From c977f0e2fd86ca3e9e3ad3961f702206c41d2767 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 二月 2025 10:41:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/platform/src/main/java/com/doumee/api/business/DiscountMemberController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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..26f53d2 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;
@@ -85,6 +86,24 @@
@GetMapping("/{id}")
@RequiresPermissions("business:discountmember:query")
public ApiResponse findById(@PathVariable String id) {
- return ApiResponse.success(discountMemberService.findById(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