From b95715d5cdc806cbb15cc7f49c538e61f5ab5dc6 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:31:46 +0800
Subject: [PATCH] bug和二维码
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java | 121 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 118 insertions(+), 3 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..f5a7c03 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
@@ -5,10 +5,14 @@
import com.ruoyi.goods.domain.dto.MgtActivityEditDto;
import com.ruoyi.goods.domain.dto.MgtActivityPageDto;
import com.ruoyi.goods.domain.dto.MgtActivityRecordPageDto;
+import com.ruoyi.goods.domain.dto.StaffActivityListDto;
import com.ruoyi.goods.domain.pojo.activity.Activity;
-import com.ruoyi.goods.domain.vo.MgtActivityGetVo;
-import com.ruoyi.goods.domain.vo.MgtActivityPageVo;
-import com.ruoyi.goods.domain.vo.MgtActivityRecordPageVo;
+import com.ruoyi.goods.domain.vo.*;
+import com.ruoyi.system.api.domain.dto.AGStockChangeDto;
+import com.ruoyi.system.api.domain.dto.ActivityGoodsGetDto;
+import com.ruoyi.system.api.domain.dto.ActivityTotalChangeDto;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
+import com.ruoyi.system.api.domain.vo.ActivityGoodsGetVo;
import java.util.List;
@@ -66,4 +70,115 @@
* @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);
+
+ /**
+ * @description 获取活动列表
+ * @author jqs
+ * @date 2023/7/4 15:31
+ * @param
+ * @return List<MgtActivityListVo>
+ */
+ List<MgtActivityListVo> listMgtActivity();
+
+ /**
+ * @description 获取商户推荐活动
+ * @author jqs
+ * @date 2023/7/4 18:14
+ * @param shopId
+ * @return Activity
+ */
+ Activity getRecommendActivity(Long shopId);
+
+ /**
+ * @description 获取商户参与活动id
+ * @author jqs
+ * @date 2023/7/4 19:55
+ * @param shopId
+ * @return List<String>
+ */
+ List<String> listActivityIdByShopId(Long shopId);
+
+ /**
+ * @description 分页获取活动列表
+ * @author jqs
+ * @date 2023/7/5 18:45
+ * @param page
+ * @param shopId
+ * @return List<AppActivityPageVo>
+ */
+ List<AppActivityPageVo> pageAppActivity(Page page, Long shopId);
+
+ /**
+ * @description 获取用户活动商品信息
+ * @author jqs
+ * @date 2023/7/6 16:18
+ * @param activityGoodsGetDto
+ * @return ActivityGoodsGetVo
+ */
+ ActivityGoodsGetVo getUserActivityGoods(ActivityGoodsGetDto activityGoodsGetDto);
+
+ /**
+ * @description 活动定时开始
+ * @author jqs
+ * @date 2023/7/12 19:44
+ * @param
+ * @return void
+ */
+ void timingStartActivity();
+
+ /**
+ * @description 开始活动
+ * @author jqs
+ * @date 2023/7/12 20:31
+ * @param activityId
+ * @return void
+ */
+ void startActivity(String activityId);
+
+ /**
+ * @description 结束活动
+ * @author jqs
+ * @date 2023/7/12 20:31
+ * @param activityId
+ * @return void
+ */
+ void endActivity(String activityId);
+
+ /**
+ * @description 活动商品库存变化
+ * @author jqs
+ * @date 2023/7/13 13:53
+ * @param
+ * @return void
+ */
+ void changeActivityTotal(ActivityTotalChangeDto activityTotalChangeDto);
+
+ /**
+ * @description 活动商品库存变化
+ * @author jqs
+ * @date 2023/7/13 13:53
+ * @param
+ * @return void
+ */
+ void changeActivityStock(AGStockChangeDto agStockChangeDto);
+
+
+ /**
+ * @description 获取活动列表
+ * @author jqs
+ * @date 2023/7/17 14:46
+ * @param staffActivityListDto
+ * @return List<MgtActivityListVo>
+ */
+ List<MgtActivityListVo> listStaffActivity(StaffActivityListDto staffActivityListDto);
}
--
Gitblit v1.7.1