From 03f1f3372a10a08f96f3308bfa099e86a55046d0 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 30 一月 2024 09:32:38 +0800 Subject: [PATCH] 修改数据权限bug --- ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java | 96 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 94 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java index 02e804e..63fb062 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java @@ -2,9 +2,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.goods.domain.dto.MgtActivityPageDto; -import com.ruoyi.goods.domain.pojo.activity.Activity; +import com.ruoyi.goods.domain.dto.MgtActivityRecordPageDto; +import com.ruoyi.goods.domain.dto.StaffActivityListDto; +import com.ruoyi.system.api.domain.poji.activity.Activity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.goods.domain.vo.MgtActivityPageVo; +import com.ruoyi.goods.domain.vo.*; +import com.ruoyi.system.api.domain.dto.AGStockChangeDto; +import com.ruoyi.system.api.domain.dto.MerPageDto; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -27,4 +31,92 @@ * @return List<MgtActivityPageVo> */ List<MgtActivityPageVo> pageMgtActivity(Page page, @Param("param") MgtActivityPageDto mgtActivityPageDto); + + + /** + * @description 分页获取活动参与记录列表 + * @param mgtActivityRecordPageDto + * @return MgtActivityRecordPageVo + * @author jqs34 + * @date 2023/6/24 16:58 + */ + List<MgtActivityRecordPageVo> pageMgtActivityRecord(Page page, @Param("param")MgtActivityRecordPageDto mgtActivityRecordPageDto); + + /** + * @description 分页获取平台活动列表 + * @author jqs + * @date 2023/6/30 17:33 + * @param page + * @param merPageDto + * @return List<MerActivityPageVo> + */ + List<MerActivityPageVo> pagePlatformMerActivity(Page page, @Param("param")MerPageDto merPageDto); + + /** + * @description + * @author jqs + * @date 2023/7/4 15:36 + * @param + * @return List<MgtActivityListVo> + */ + List<MgtActivityListVo> listMgtActivity(); + + /** + * @description 获取商户推荐活动 + * @author jqs + * @date 2023/7/4 18:14 + * @param shopId + * @return Activity + */ + Activity getRecommendActivity(@Param("shopId")Long shopId); + + /** + * @description 获取商户参与活动id + * @author jqs + * @date 2023/7/4 19:55 + * @param shopId + * @return List<Long> + */ + List<String> listActivityIdByShopId(@Param("shopId")Long shopId); + + + /** + * @description 分页获取活动列表 + * @author jqs + * @date 2023/7/5 18:45 + * @param page + * @param shopId + * @return List<AppActivityPageVo> + */ + List<AppActivityPageVo> pageAppActivity(Page page, @Param("shopId")Long shopId); + + /** + * @description 活动商品库存变化 + * @author jqs + * @date 2023/7/13 13:53 + * @param + * @return void + */ + void addActivityGoodsStock(@Param("param")AGStockChangeDto agStockChangeDto); + + void subActivityGoodsStock(@Param("param")AGStockChangeDto agStockChangeDto); + + /** + * @description 判断活动是否售罄 + * @author jqs + * @date 2023/7/13 15:35 + * @param activityId + * @return Integer + */ + Integer checkSellOut(@Param("activityId")String activityId); + + + /** + * @description 获取活动列表 + * @author jqs + * @date 2023/7/17 14:46 + * @param staffActivityListDto + * @return List<MgtActivityListVo> + */ + List<MgtActivityListVo> listStaffActivity(@Param("param")StaffActivityListDto staffActivityListDto); } -- Gitblit v1.7.1