From a3d99a38fb3c56d9948eabb64dd301cb0aa2765e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 六月 2025 12:03:11 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java
index 22ef651..367d93d 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java
@@ -7,23 +7,16 @@
import com.ruoyi.member.domain.dto.MerCouponPageDto;
import com.ruoyi.member.domain.dto.MerGoodsCouponListDto;
import com.ruoyi.member.domain.dto.MgtCouponListDto;
-import com.ruoyi.member.domain.vo.MerCouponGetVo;
-import com.ruoyi.member.domain.vo.MerCouponPageVo;
-import com.ruoyi.member.domain.vo.MetAuditCouponTotalVo;
-import com.ruoyi.member.domain.vo.MgtCouponSimpleListVo;
+import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.service.coupon.CouponService;
import com.ruoyi.member.service.member.MemberCouponService;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
import com.ruoyi.system.api.domain.dto.MerPageDto;
-import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.vo.MerMemberCouponVo;
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.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@@ -73,16 +66,16 @@
}
@RequestMapping(value = "/getMerCouponVo", method = RequestMethod.POST)
- @ApiOperation(value = "商户获取优惠券编辑信息")
- public R<MerCouponGetVo> getMerCouponVo(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+ @ApiOperation(value = "商户获取优惠券编辑信息【2.0】")
+ public R<MerCouponGetVo> getMerCouponVo(@RequestBody MerBaseGetDto merBaseGetDto) {
Long userId = SecurityUtils.getUserId();
- mgtBaseGetDto.setUserId(userId);
- MerCouponGetVo couponGetVo = couponService.getMerCouponVo(mgtBaseGetDto.getId());
+ merBaseGetDto.setUserId(userId);
+ MerCouponGetVo couponGetVo = couponService.getMerCouponVo(merBaseGetDto);
return R.ok(couponGetVo);
}
-
+
@RequestMapping(value = "/editMerCoupon", method = RequestMethod.POST)
- @ApiOperation(value = "商户编辑优惠券")
+ @ApiOperation(value = "商户编辑优惠券【2.0】")
public R editMerCoupon(@RequestBody MerCouponEditDto merCouponEditDto) {
Long userId = SecurityUtils.getUserId();
merCouponEditDto.setUserId(userId);
@@ -128,4 +121,12 @@
MetAuditCouponTotalVo auditCouponTotalVo = couponService.getMetAuditCouponTotal(merBaseDto.getShopId());
return R.ok(auditCouponTotalVo);
}
+
+ //获取商户抽奖类型优惠券列表
+ @RequestMapping(value = "/getLotteryEventCouponListByShopId/{shopId}", method = RequestMethod.POST)
+ @ApiOperation(value = "获取商户抽奖类型优惠券列表【2.0】")
+ public R<List<LotteryEventCouponListVO>> getLotteryEventCouponListByShopId(@PathVariable(value = "shopId") String shopId) {
+ return R.ok( couponService.getLotteryEventCouponListByShopId(shopId));
+ }
+
}
--
Gitblit v1.7.1