From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtCouponController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 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 dcd5cb6..8e149fe 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
@@ -2,15 +2,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.member.domain.dto.MgtCouponEditDto;
-import com.ruoyi.member.domain.dto.MgtCouponPageDto;
-import com.ruoyi.member.domain.vo.MgtCouponGetVo;
-import com.ruoyi.member.domain.vo.MgtCouponPageVo;
+import com.ruoyi.member.domain.dto.*;
+import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.service.coupon.CouponService;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -26,7 +27,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 {
@@ -49,7 +50,7 @@
@RequestMapping(value = "/getMgtCouponVo", method = RequestMethod.POST)
@ApiOperation(value = "平台获取优惠券编辑信息")
- public R<MgtCouponGetVo> pageMgtCoupon(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+ public R<MgtCouponGetVo> getMgtCouponVo(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
mgtBaseGetDto.setUserId(userId);
MgtCouponGetVo mgtCouponGetVo = couponService.getMgtCouponVo(mgtBaseGetDto.getId());
@@ -57,8 +58,9 @@
}
@RequestMapping(value = "/editMgtCoupon", method = RequestMethod.POST)
+ @Log(title = "优惠券管理", businessType = BusinessType.UPDATE,operContent = "编辑优惠券")
@ApiOperation(value = "平台编辑优惠券")
- public R editMgtCoupon(@RequestBody MgtCouponEditDto mgtCouponEditDto) {
+ public R editMgtCoupon(@Validated @RequestBody MgtCouponEditDto mgtCouponEditDto) {
Long userId = SecurityUtils.getUserId();
mgtCouponEditDto.setUserId(userId);
couponService.editMgtCoupon(mgtCouponEditDto);
@@ -66,6 +68,7 @@
}
@RequestMapping(value = "/deleteMgtCoupon", method = RequestMethod.POST)
+ @Log(title = "优惠券管理", businessType = BusinessType.DELETE,operContent = "删除优惠券")
@ApiOperation(value = "平台删除优惠券")
public R deleteMgtCoupon(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
@@ -73,4 +76,42 @@
couponService.deleteMgtCoupon(mgtBaseGetDto);
return R.ok();
}
+
+ @RequestMapping(value = "/listMgtCouponSimpleVo", method = RequestMethod.POST)
+ @ApiOperation(value = "获取优惠券选择列表")
+ public R<List<MgtCouponSimpleListVo>> listMgtCouponSimpleVo(@RequestBody MgtCouponListDto mgtCouponListDto) {
+ List<MgtCouponSimpleListVo> mgtCouponSimpleListVoList = couponService.listMgtCouponSimpleVo(mgtCouponListDto);
+ return R.ok(mgtCouponSimpleListVoList);
+ }
+
+ @RequestMapping(value = "/pageMgtAuditCoupon", method = RequestMethod.POST)
+ @ApiOperation(value = "平台分页获取优惠券审核列表")
+ public R<Page<MgtCouponAuditPageVo>> pageMgtAuditCoupon(@RequestBody MgtCouponAuditPageDto mgtCouponAuditPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtCouponAuditPageDto.setUserId(userId);
+ Page<MgtCouponAuditPageVo> page = new Page<>();
+ page.setSize(mgtCouponAuditPageDto.getPageSize());
+ page.setCurrent(mgtCouponAuditPageDto.getPageNum());
+ List<MgtCouponAuditPageVo> mgtCouponPageVoList = couponService.pageMgtAuditCoupon(page,mgtCouponAuditPageDto);
+ return R.ok(page.setRecords(mgtCouponPageVoList));
+ }
+
+ @RequestMapping(value = "/getMgtCouponAuditVo", method = RequestMethod.POST)
+ @ApiOperation(value = "平台获取优惠券审核信息")
+ public R<MgtCouponAuditGetVo> getMgtCouponAuditVo(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtBaseGetDto.setUserId(userId);
+ MgtCouponAuditGetVo mgtCouponAuditVo = couponService.getMgtCouponAuditVo(mgtBaseGetDto.getId());
+ return R.ok(mgtCouponAuditVo);
+ }
+
+ @RequestMapping(value = "/auditMgtCoupon", method = RequestMethod.POST)
+ @Log(title = "优惠券管理", businessType = BusinessType.UPDATE,operContent = "审核优惠券")
+ @ApiOperation(value = "平台审核优惠券")
+ public R auditMgtCoupon(@RequestBody MgtCouponAuditDto mgtCouponAuditDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtCouponAuditDto.setUserId(userId);
+ couponService.auditMgtCoupon(mgtCouponAuditDto);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1