From ea1a62ba6484d6c6cb1ca67dcea938a95ba18fc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 26 五月 2025 18:26:26 +0800
Subject: [PATCH] 新增加用户端接口
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java | 74 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
index f0c77b7..bdb772a 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.shop.domain.dto.FileDto;
import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.MemberTaskRecord;
@@ -9,7 +11,6 @@
import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo;
import com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo;
import com.ruoyi.shop.mapper.task.MemberTaskRecordMapper;
-import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.shop.service.task.MemberTaskRecordService;
import com.ruoyi.shop.service.task.TaskFileService;
import org.springframework.stereotype.Service;
@@ -36,8 +37,6 @@
@Resource
private TaskFileService taskFileService;
- @Resource
- private ShopService shopService;
/**
* 商户分页获取会员跟进任务
* @param page
@@ -50,22 +49,43 @@
if(merMemberTaskRecordPageVoList!=null&&!merMemberTaskRecordPageVoList.isEmpty()){
Long followId;
List<TaskFile> taskFileList;
- List<String> picture = new ArrayList<>();
- List<String> video = new ArrayList<>();
- List<String> audio = new ArrayList<>();
+ List<FileDto> picture = new ArrayList<>();
+ List<FileDto> video = new ArrayList<>();
+ List<FileDto> audio = new ArrayList<>();
for(MerMemberTaskRecordPageVo merMemberTaskRecordPageVo : merMemberTaskRecordPageVoList){
followId = merMemberTaskRecordPageVo.getFollowId();
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);
if(taskFileList!=null&&!taskFileList.isEmpty()){
- picture = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ picture = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
}
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,2);
if(taskFileList!=null&&!taskFileList.isEmpty()){
- video = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ video = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
}
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,3);
if(taskFileList!=null&&!taskFileList.isEmpty()){
- audio = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ audio = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
}
merMemberTaskRecordPageVo.setPicture(picture);
merMemberTaskRecordPageVo.setVideo(video);
@@ -84,26 +104,50 @@
*/
@Override
public List<MgtMemberFollowPageVo> pageMgtMemberFollow( MgtMemberTaskPageDto mgtMemberTaskPageDto){
+ if(mgtMemberTaskPageDto.getTaskDate()==null){
+ mgtMemberTaskPageDto.setTaskDate(DateUtils.getDate());
+ }
List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordMapper.pageMgtMemberFollow( mgtMemberTaskPageDto);
if(mgtMemberFollowPageVoList!=null&&!mgtMemberFollowPageVoList.isEmpty()){
Long followId;
List<TaskFile> taskFileList;
- List<String> picture = new ArrayList<>();
- List<String> video = new ArrayList<>();
- List<String> audio = new ArrayList<>();
+ List<FileDto> picture = new ArrayList<>();
+ List<FileDto> video = new ArrayList<>();
+ List<FileDto> audio = new ArrayList<>();
for(MgtMemberFollowPageVo mgtMemberFollowPageVo : mgtMemberFollowPageVoList){
followId = mgtMemberFollowPageVo.getFollowId();
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);
if(taskFileList!=null&&!taskFileList.isEmpty()){
- picture = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ picture = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
}
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,2);
if(taskFileList!=null&&!taskFileList.isEmpty()){
- video = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ video = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
}
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,3);
if(taskFileList!=null&&!taskFileList.isEmpty()){
- audio = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ audio = taskFileList.stream()
+ .map(taskFile -> {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileName(taskFile.getFileName());
+ fileDto.setFileUrl(taskFile.getFileUrl());
+ return fileDto;
+ })
+ .collect(Collectors.toList());
}
mgtMemberFollowPageVo.setPicture(picture);
mgtMemberFollowPageVo.setVideo(video);
--
Gitblit v1.7.1