From f10a7c29f1a3748b28d2809335625c7888473b26 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 22 九月 2025 22:21:19 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java | 27 +++++++++++++++++----------
1 files changed, 17 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..385763a 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,11 @@
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.common.core.domain.R;
+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 +83,7 @@
* @param
* @return List<MgtActivityListVo>
*/
- List<MgtActivityListVo> listMgtActivity();
+ List<MgtActivityListVo> listMgtActivity(MgtActivityListDto mgtActivityListDto);
/**
* @description 获取商户推荐活动
@@ -181,4 +176,16 @@
* @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);
+
+ R endImmediately(MgtBaseGetDto mgtBaseGetDto);
}
--
Gitblit v1.7.1