From 08b2a4048452bef8d99ac5a700dd5aa6a4121699 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 18:04:14 +0800
Subject: [PATCH] 商户端会员和平台活动

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java
index 5ed8fa5..0c9d5e0 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java
@@ -6,9 +6,11 @@
 import com.ruoyi.goods.domain.dto.MgtActivityPageDto;
 import com.ruoyi.goods.domain.dto.MgtActivityRecordPageDto;
 import com.ruoyi.goods.domain.pojo.activity.Activity;
+import com.ruoyi.goods.domain.vo.MerActivityPageVo;
 import com.ruoyi.goods.domain.vo.MgtActivityGetVo;
 import com.ruoyi.goods.domain.vo.MgtActivityPageVo;
 import com.ruoyi.goods.domain.vo.MgtActivityRecordPageVo;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
 
 import java.util.List;
 
@@ -66,4 +68,14 @@
     * @date 2023/6/24 16:58
     */
     List<MgtActivityRecordPageVo> pageMgtActivityRecord(Page page,MgtActivityRecordPageDto mgtActivityRecordPageDto);
+
+    /**
+     * @description  分页获取平台活动列表
+     * @author  jqs
+     * @date    2023/6/30 17:33
+     * @param page
+     * @param merPageDto
+     * @return  List<MerActivityPageVo>
+     */
+    List<MerActivityPageVo> pagePlatformMerActivity(Page page, MerPageDto merPageDto);
 }

--
Gitblit v1.7.1