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 | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 f5a7c03..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
@@ -2,16 +2,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-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.dto.*;
+import com.ruoyi.system.api.domain.poji.activity.Activity;
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.dto.*;
import com.ruoyi.system.api.domain.vo.ActivityGoodsGetVo;
import java.util.List;
@@ -88,7 +82,7 @@
* @param
* @return List<MgtActivityListVo>
*/
- List<MgtActivityListVo> listMgtActivity();
+ List<MgtActivityListVo> listMgtActivity(MgtActivityListDto mgtActivityListDto);
/**
* @description 获取商户推荐活动
@@ -181,4 +175,14 @@
* @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