From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskService.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 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 2dfd768..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,12 +1,13 @@
 package com.ruoyi.shop.service.task;
 
 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.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.shop.domain.vo.MerMemberTaskPageVo;
+import com.ruoyi.system.api.domain.vo.MemberTaskSimpleVo;
 
 import java.util.List;
 
@@ -35,9 +36,30 @@
     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