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/ShopTaskService.java |   80 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 79 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 41fea21..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
@@ -1,7 +1,16 @@
 package com.ruoyi.shop.service.task;
 
-import com.ruoyi.shop.domain.pojo.task.ShopTask;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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;
+import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +22,73 @@
  */
 public interface ShopTaskService extends IService<ShopTask> {
 
+    /**
+     * 平台跟进商户
+     * @param mgtFollowShopTaskDto
+     */
+    void followShopTask(MgtFollowShopTaskDto mgtFollowShopTaskDto);
+
+    /**
+    * @description boardTaskTotal
+    * @param 
+    * @return MgtBulletinBoardVo
+    * @author jqs34
+    * @date 2023/6/18 17:09
+    */
+    MgtBulletinBoardVo boardTaskTotal(List<Long> userIds);
+
+    /**
+     * @description  员工端获取进行中商户任务数
+     * @author  jqs
+     * @param shopIds
+     * @return  Integer
+     */
+    Integer getShopIngTotal(List<Long> shopIds);
+
+
+    /**
+     * @description  分页获取员工跟进任务
+     * @author  jqs
+     * @date    2023/7/15 15:09
+     * @param page
+     * @param staffShopTaskPageDto
+     * @return  List<StaffShopTaskPageVo>
+     */
+    List<StaffShopTaskPageVo> pageStaffShopTask(Page page, StaffShopTaskPageDto staffShopTaskPageDto);
+
+    /**
+     * @description  员工端新增任务
+     * @author  jqs
+     * @date    2023/7/15 19:06
+     * @param staffAddTaskDto
+     * @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