From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java
index 7956b43..d8eec1c 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.member.domain.dto.*;
import com.ruoyi.member.domain.pojo.coupon.Coupon;
import com.ruoyi.member.domain.vo.*;
@@ -201,5 +202,17 @@
*/
MetAuditCouponTotalVo getMetAuditCouponTotal(Long shopId);
- void endImmediately(MgtBaseGetDto mgtBaseGetDto);
+ /**
+ * 立即结束
+ * @param mgtBaseGetDto
+ */
+ R endImmediately(MgtBaseGetDto mgtBaseGetDto);
+
+ /**
+ * 平台获取抽奖类型优惠券列表
+ * @return
+ */
+ List<LotteryEventCouponListVO> getLotteryEventCouponList();
+
+ List<LotteryEventCouponListVO> getLotteryEventCouponListByShopId(String shopId);
}
--
Gitblit v1.7.1