From 2cf783a1480050c0f13907c5fde625edee8fce62 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 七月 2025 16:41:23 +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/MemberTaskService.java | 8 ++++++--
1 files changed, 6 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 65fdfc7..66b05e6 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
@@ -36,8 +36,11 @@
void createMemberTask(MerCreateMemberTaskDto merCreateMemberTaskDto);
/**
- *
+ * @description 会员任务跟进
+ * @author jqs
+ * @date 2023/7/4 17:16
* @param merFollowMemberTaskDto
+ * @return void
*/
void followMemberTask(MerFollowMemberTaskDto merFollowMemberTaskDto);
@@ -48,7 +51,7 @@
* @param shopId
* @return Integer
*/
- Integer getMemberIngTotal(Long shopId);
+ List<Integer> getMemberIngTotal(Long shopId);
/**
* @description 获取最近任务
@@ -58,4 +61,5 @@
* @return MemberTaskSimpleVo
*/
MemberTaskSimpleVo getLastMemberTask(Long userId);
+
}
--
Gitblit v1.7.1