From 07fb617c686699435cde29e8147f11a125d7d618 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 23 六月 2025 11:10:12 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 724569d..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,10 +7,7 @@
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;
@@ -19,10 +16,7 @@
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;
@@ -127,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