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/MemberTaskService.java |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 50 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskService.java
index 5dd0e70..937c370 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskService.java
@@ -1,7 +1,15 @@
 package com.ruoyi.shop.service.task;
 
-import com.ruoyi.shop.domain.pojo.task.MemberTask;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.shop.domain.dto.MerCreateMemberTaskDto;
+import com.ruoyi.shop.domain.dto.MerFollowMemberTaskDto;
+import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
+import com.ruoyi.shop.domain.pojo.task.MemberTask;
+import com.ruoyi.shop.domain.vo.MerMemberTaskPageVo;
+import com.ruoyi.system.api.domain.vo.MemberTaskSimpleVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +21,45 @@
  */
 public interface MemberTaskService extends IService<MemberTask> {
 
+    /**
+     *
+     * @param page
+     * @param merMemberTaskPageDto
+     * @return
+     */
+    List<MerMemberTaskPageVo> pageMerMemberTask(Page page, MerMemberTaskPageDto merMemberTaskPageDto);
+
+    /**
+     *
+     * @param merCreateMemberTaskDto
+     */
+    void createMemberTask(MerCreateMemberTaskDto merCreateMemberTaskDto);
+
+    /**
+     * @description  会员任务跟进
+     * @author  jqs
+     * @date    2023/7/4 17:16
+     * @param merFollowMemberTaskDto
+     * @return  void
+     */
+    void followMemberTask(MerFollowMemberTaskDto merFollowMemberTaskDto);
+
+    /**
+     * @description  获取进行中任务数
+     * @author  jqs
+     * @date    2023/6/26 13:45
+     * @param shopId
+     * @return  Integer
+     */
+    Integer getMemberIngTotal(Long shopId);
+
+    /**
+     * @description  获取最近任务
+     * @author  jqs
+     * @date    2023/6/29 18:25
+     * @param
+     * @return  MemberTaskSimpleVo
+     */
+    MemberTaskSimpleVo getLastMemberTask(Long userId);
+
 }

--
Gitblit v1.7.1