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/impl/activity/ActivityServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
index edadea4..76e51e3 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
@@ -11,16 +11,14 @@
import com.ruoyi.goods.domain.dto.MgtActivityRecordPageDto;
import com.ruoyi.goods.domain.pojo.activity.Activity;
import com.ruoyi.goods.domain.pojo.activity.ActivityTotal;
-import com.ruoyi.goods.domain.vo.MgtActivityGetVo;
-import com.ruoyi.goods.domain.vo.MgtActivityGoodsListVo;
-import com.ruoyi.goods.domain.vo.MgtActivityPageVo;
-import com.ruoyi.goods.domain.vo.MgtActivityRecordPageVo;
+import com.ruoyi.goods.domain.vo.*;
import com.ruoyi.goods.mapper.activity.ActivityMapper;
import com.ruoyi.goods.service.activity.ActivityGoodsService;
import com.ruoyi.goods.service.activity.ActivityService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.goods.service.activity.ActivityTotalService;
import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
import com.ruoyi.system.api.domain.dto.MgtBaseBathDto;
import com.ruoyi.system.api.domain.dto.MgtUserIdByKeywordDto;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
@@ -254,4 +252,18 @@
}
return activityRecordPageVoList;
}
+
+ /**
+ * @description 分页获取平台活动列表
+ * @author jqs
+ * @date 2023/6/30 17:33
+ * @param page
+ * @param merPageDto
+ * @return List<MerActivityPageVo>
+ */
+ @Override
+ public List<MerActivityPageVo> pagePlatformMerActivity(Page page, MerPageDto merPageDto){
+ List<MerActivityPageVo> activityPageVoList = activityMapper.pagePlatformMerActivity(page, merPageDto);
+ return activityPageVoList;
+ }
}
--
Gitblit v1.7.1