From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java |  167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 165 insertions(+), 2 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 4a40d4a..2bc543c 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
@@ -1,8 +1,14 @@
 package com.ruoyi.goods.service.activity;
 
-import com.ruoyi.goods.domain.dto.MgtActivityEditDto;
-import com.ruoyi.goods.domain.pojo.activity.Activity;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.goods.domain.dto.*;
+import com.ruoyi.system.api.domain.poji.activity.Activity;
+import com.ruoyi.goods.domain.vo.*;
+import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.system.api.domain.vo.ActivityGoodsGetVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -22,4 +28,161 @@
      * @return  void
      */
     void editMgtActivity(MgtActivityEditDto mgtActivityEditDto);
+
+    /**
+     * @description  分页获取活动列表
+     * @author  jqs
+     * @date    2023/6/14 16:39
+     * @param mgtActivityPageDto
+     * @return  List<MgtActivityPageVo>
+     */
+    List<MgtActivityPageVo> pageMgtActivity(Page page, MgtActivityPageDto mgtActivityPageDto);
+
+    /**
+     * @description  获取活动编辑信息
+     * @author  jqs
+     * @date    2023/6/14 17:30
+     * @param activityId
+     * @return  MgtActivityGetVo
+     */
+    MgtActivityGetVo getMgtActivity(String activityId);
+
+    /**
+     * @description 平台删除活动
+     * @author  jqs
+     * @date    2023/6/14 18:12
+     * @param activityId
+     * @return  void
+     */
+    void deleteMgtActivity(String activityId);
+
+    /**
+    * @description 分页获取活动参与记录列表
+    * @param mgtActivityRecordPageDto
+    * @return MgtActivityRecordPageVo
+    * @author jqs34
+    * @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(MgtActivityListDto mgtActivityListDto);
+
+    /**
+     * @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);
+
+
+    /**
+     * @description  判断商户是否在活动范围
+     * @author  jqs
+     * @date    2023/9/7 14:13
+     * @param merActivityShopDto
+     * @return  Boolean
+     */
+    Boolean judgeActivityShop(MerActivityShopDto merActivityShopDto);
 }

--
Gitblit v1.7.1