From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskService.java |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskService.java
index 1789e67..e6bdf22 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.shop.domain.dto.MgtFollowShopTaskDto;
 import com.ruoyi.shop.domain.dto.StaffAddTaskDto;
+import com.ruoyi.shop.domain.dto.StaffFollowShopTaskDto;
 import com.ruoyi.shop.domain.dto.StaffShopTaskPageDto;
 import com.ruoyi.shop.domain.pojo.task.ShopTask;
 import com.ruoyi.shop.domain.vo.StaffShopTaskPageVo;
@@ -34,7 +35,7 @@
     * @author jqs34
     * @date 2023/6/18 17:09
     */
-    MgtBulletinBoardVo boardTaskTotal();
+    MgtBulletinBoardVo boardTaskTotal(List<Long> userIds);
 
     /**
      * @description  员工端获取进行中商户任务数
@@ -63,4 +64,31 @@
      * @return  void
      */
     void staffAddTask(StaffAddTaskDto staffAddTaskDto);
+
+    /**
+    * @description 员工商户任务跟进
+    * @param staffFollowShopTaskDto
+    * @return void
+    * @author jqs34
+    * @date 2023/7/16 11:56
+    */
+    void staffFollowShopTask(StaffFollowShopTaskDto staffFollowShopTaskDto);
+
+    /**
+     * @description  检查任务时间状态
+     * @author  jqs
+     * @date    2023/7/19 18:01
+     * @param
+     * @return  void
+     */
+    void checkTaskDateStatus();
+
+    /**
+     * @description  获取商户最近任务
+     * @author  jqs
+     * @date    2023/8/22 17:27
+     * @param shopId
+     * @return  ShopTask
+     */
+    ShopTask getLastTask(Long shopId);
 }

--
Gitblit v1.7.1