From aefe81a52fcbda2175b40575982d18e648e7013c Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 08 七月 2025 11:36:22 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtCouponController.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtCouponController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtCouponController.java
index bef8300..32d355b 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtCouponController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtCouponController.java
@@ -11,10 +11,8 @@
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@@ -26,7 +24,7 @@
* @Date 2023/6/13 9:15
* @Version 1.0
*/
-@Api(value = "平台端优惠券相关接口", tags = "平台端优惠券相关接口", description = "平台端优惠券相关接口")
+@Api(value = "管理后台优惠券相关接口", tags = "管理后台优惠券相关接口", description = "管理后台优惠券相关接口")
@RestController
@RequestMapping("/mgt/coupon")
public class MgtCouponController {
@@ -48,7 +46,7 @@
}
@RequestMapping(value = "/getMgtCouponVo", method = RequestMethod.POST)
- @ApiOperation(value = "平台获取优惠券编辑信息")
+ @ApiOperation(value = "平台获取优惠券编辑信息【2.0】")
public R<MgtCouponGetVo> getMgtCouponVo(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
mgtBaseGetDto.setUserId(userId);
@@ -58,8 +56,8 @@
@RequestMapping(value = "/editMgtCoupon", method = RequestMethod.POST)
@Log(title = "优惠券管理", businessType = BusinessType.UPDATE,operContent = "编辑优惠券")
- @ApiOperation(value = "平台编辑优惠券")
- public R editMgtCoupon(@RequestBody MgtCouponEditDto mgtCouponEditDto) {
+ @ApiOperation(value = "平台编辑优惠券【2.0】")
+ public R editMgtCoupon(@Validated @RequestBody MgtCouponEditDto mgtCouponEditDto) {
Long userId = SecurityUtils.getUserId();
mgtCouponEditDto.setUserId(userId);
couponService.editMgtCoupon(mgtCouponEditDto);
@@ -96,7 +94,7 @@
}
@RequestMapping(value = "/getMgtCouponAuditVo", method = RequestMethod.POST)
- @ApiOperation(value = "平台获取优惠券编辑信息")
+ @ApiOperation(value = "平台获取优惠券审核信息")
public R<MgtCouponAuditGetVo> getMgtCouponAuditVo(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
mgtBaseGetDto.setUserId(userId);
@@ -113,4 +111,21 @@
couponService.auditMgtCoupon(mgtCouponAuditDto);
return R.ok();
}
+
+ @RequestMapping(value = "/endImmediately", method = RequestMethod.POST)
+ @Log(title = "优惠券管理", businessType = BusinessType.UPDATE,operContent = "立即结束")
+ @ApiOperation(value = "立即结束【2.0】")
+ public R endImmediately(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtBaseGetDto.setUserId(userId);
+ return couponService.endImmediately(mgtBaseGetDto);
+ }
+
+ //获取抽奖类型优惠券列表
+ @RequestMapping(value = "/getLotteryEventCouponList", method = RequestMethod.POST)
+ @ApiOperation(value = "平台获取抽奖类型优惠券列表【2.0】")
+ public R<List<LotteryEventCouponListVO>> getLotteryEventCouponList(@RequestParam(value = "shopId",required = false) Long shopId) {
+ return R.ok( couponService.getLotteryEventCouponList(shopId));
+ }
+
}
--
Gitblit v1.7.1