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/mapper/task/ShopTaskMapper.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/ShopTaskMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/ShopTaskMapper.java
index a79ab8e..bc764cd 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/ShopTaskMapper.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/ShopTaskMapper.java
@@ -1,10 +1,10 @@
package com.ruoyi.shop.mapper.task;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
-import com.ruoyi.shop.domain.pojo.task.ShopTask;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.shop.domain.dto.StaffShopTaskPageDto;
+import com.ruoyi.shop.domain.pojo.task.ShopTask;
+import com.ruoyi.shop.domain.vo.StaffShopTaskPageVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -19,5 +19,58 @@
*/
public interface ShopTaskMapper extends BaseMapper<ShopTask> {
+ /**
+ * @description 员工端获取进行中商户任务数
+ * @author jqs
+ * @param shopIds
+ * @return Integer
+ */
+ Integer getShopIngTotal(@Param("shopIds") List<Long> shopIds);
+
+ /**
+ * @description 分页获取员工跟进任务
+ * @author jqs
+ * @date 2023/7/15 15:09
+ * @param page
+ * @param staffShopTaskPageDto
+ * @return List<StaffShopTaskPageVo>
+ */
+ List<StaffShopTaskPageVo> pageStaffShopTask(Page page, @Param("param")StaffShopTaskPageDto staffShopTaskPageDto);
+
+ /**
+ * @description 更新商户任务
+ * @author jqs
+ * @date 2023/7/20 15:53
+ * @param
+ * @return void
+ */
+ void checkShopTaskStatus();
+
+ /**
+ * @description 更新商户任务
+ * @author jqs
+ * @date 2023/7/20 15:53
+ * @param
+ * @return void
+ */
+ void checkAgencyTaskStatus();
+
+ /**
+ * @description 更新商户任务
+ * @author jqs
+ * @date 2023/7/20 15:53
+ * @param
+ * @return void
+ */
+ void checkMemberTaskStatus();
+
+ /**
+ * @description 获取商户最近任务
+ * @author jqs
+ * @date 2023/8/22 17:27
+ * @param shopId
+ * @return ShopTask
+ */
+ ShopTask getLastTask(@Param("shopId")Long shopId);
}
--
Gitblit v1.7.1