From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventService.java |   43 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventService.java
index 29a1855..f599d73 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventService.java
@@ -4,9 +4,10 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.goods.api.domain.LotteryEvent;
-import com.ruoyi.goods.domain.vo.AppLotteryEventPageVo;
-import com.ruoyi.goods.domain.vo.LotteryEventVo;
-import com.ruoyi.goods.domain.vo.ShopLotteryDrawListVo;
+import com.ruoyi.goods.domain.dto.MgtLotteryEventEditDTO;
+import com.ruoyi.goods.domain.dto.MgtLotteryEventJoinUserPageDTO;
+import com.ruoyi.goods.domain.dto.MgtLotteryEventPageDto;
+import com.ruoyi.goods.domain.vo.*;
 
 import java.util.List;
 
@@ -52,4 +53,40 @@
 	 * @return
 	 */
 	List<ShopLotteryDrawListVo> getShopLotteryDrawList(Page<ShopLotteryDrawListVo> page, Long shopId);
+
+	/**
+	 * 平台添加抽奖活动
+	 * @param dto
+	 * @return
+	 */
+    R<ShopLotteryDrawVo> editLotteryEvent(MgtLotteryEventEditDTO dto);
+
+	/**
+	 * 分页查询抽奖活动
+	 * @param page
+	 * @param dto
+	 * @return
+	 */
+	List<MgtLotteryEventPageVo> pageMgtLotteryEvent(Page<MgtLotteryEventPageVo> page, MgtLotteryEventPageDto dto);
+
+	/**
+	 * 查看抽奖活动详情
+	 * @param id
+	 * @return
+	 */
+	R<MgtLotteryEventDetailVO> getLotteryEventDetailById(String id);
+
+	/**
+	 * 删除抽奖活动
+	 * @param id
+	 * @return
+	 */
+	R deleteMgtLotteryEvent(String id);
+
+	/**
+	 * 立即结束抽奖活动
+	 * @param id
+	 * @return
+	 */
+	R endImmediatelyLotteryEvent(String id);
 }

--
Gitblit v1.7.1