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/MemberTaskMapper.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/MemberTaskMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/MemberTaskMapper.java
index 69ea74b..7ea3300 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/MemberTaskMapper.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/MemberTaskMapper.java
@@ -5,6 +5,7 @@
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 org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -29,11 +30,31 @@
/**
- * @description 获取进行中任务数
+ * @description 商户端获取进行中任务数
* @author jqs
* @date 2023/6/26 13:45
* @param shopId
* @return Integer
*/
Integer getMemberIngTotal(@Param("shopId")Long shopId);
+
+
+ /**
+ * @description 获取最近任务
+ * @author jqs
+ * @date 2023/6/29 18:25
+ * @param
+ * @return MemberTaskSimpleVo
+ */
+ MemberTaskSimpleVo getLastMemberTask(@Param("userId")Long userId);
+
+ /**
+ * @description 获取任务处理内容
+ * @author jqs
+ * @date 2023/8/24 12:05
+ * @param taskId
+ * @return List<String>
+ */
+ List<String> listDealContent(@Param("taskId")String taskId);
+
}
--
Gitblit v1.7.1