From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java
index c455727..0220f24 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java
@@ -1,7 +1,14 @@
package com.ruoyi.shop.service.task;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
+import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.MemberTaskRecord;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo;
+import com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +20,20 @@
*/
public interface MemberTaskRecordService extends IService<MemberTaskRecord> {
+ /**
+ * 商户分页获取会员跟进任务
+ * @param page
+ * @param merMemberTaskPageDto
+ * @return
+ */
+ List<MerMemberTaskRecordPageVo> pageMerMemberTaskRecord(Page page, MerMemberTaskPageDto merMemberTaskPageDto);
+
+ /**
+ * @description 平台分页获取会员跟进任务
+ * @author jqs
+ * @date 2023/6/16 15:48
+ * @param mgtMemberTaskPageDto
+ * @return List<MgtMemberFollowPageVo>
+ */
+ List<MgtMemberFollowPageVo> pageMgtMemberFollow(MgtMemberTaskPageDto mgtMemberTaskPageDto);
}
--
Gitblit v1.7.1