From 8b0f0fa277a2390463c6582c4fbe8600e1e53ced Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 31 五月 2023 18:19:16 +0800
Subject: [PATCH] 用户管理商户管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java | 72 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 16 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 5521fab..ee2bbb8 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
@@ -5,15 +5,22 @@
import com.ruoyi.shop.domain.pojo.task.MemberTaskRecord;
import com.ruoyi.shop.domain.pojo.task.TaskFile;
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.service.task.TaskFileService;
+import com.ruoyi.shop.util.FileConvertUtils;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
+import com.ruoyi.system.api.service.RemoteShopService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
import java.util.StringJoiner;
+import java.util.stream.Collectors;
/**
* <p>
@@ -32,9 +39,10 @@
@Resource
private TaskFileService taskFileService;
-
+ @Resource
+ private ShopService shopService;
/**
- *
+ * 商户分页获取会员跟进任务
* @param page
* @param merMemberTaskPageDto
* @return
@@ -45,17 +53,23 @@
if(merMemberTaskRecordPageVoList!=null&&!merMemberTaskRecordPageVoList.isEmpty()){
Long followId;
List<TaskFile> taskFileList;
- String picture;
- String video;
- String audio;
+ List<String> picture = new ArrayList<>();
+ List<String> video = new ArrayList<>();
+ List<String> audio = new ArrayList<>();
for(MerMemberTaskRecordPageVo merMemberTaskRecordPageVo : merMemberTaskRecordPageVoList){
followId = merMemberTaskRecordPageVo.getFollowId();
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);
- picture = convertFileListToString(taskFileList);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ picture = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,2);
- video = convertFileListToString(taskFileList);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ video = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,3);
- audio = convertFileListToString(taskFileList);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ audio = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
merMemberTaskRecordPageVo.setPicture(picture);
merMemberTaskRecordPageVo.setVideo(video);
merMemberTaskRecordPageVo.setAudio(audio);
@@ -64,15 +78,41 @@
return merMemberTaskRecordPageVoList;
}
- private String convertFileListToString(List<TaskFile> taskFileList){
- StringJoiner sj = new StringJoiner(",");
- if(taskFileList!=null&&!taskFileList.isEmpty()){
- for(TaskFile taskFile : taskFileList){
- sj.add(taskFile.getFileUrl());
+ /**
+ * 平台分页获取会员跟进任务
+ * @param page
+ * @return
+ */
+ @Override
+ public List<MgtMemberFollowPageVo> pageMgtMemberFollow(Page page){
+ List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordMapper.pageMgtMemberFollow(page);
+ 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<>();
+ Long shopId;
+ Shop shop;
+ 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());
+ }
+ taskFileList = taskFileService.listByFollowIdAndFollowType(followId,2);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ video = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
+ taskFileList = taskFileService.listByFollowIdAndFollowType(followId,3);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ audio = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
+ mgtMemberFollowPageVo.setPicture(picture);
+ mgtMemberFollowPageVo.setVideo(video);
+ mgtMemberFollowPageVo.setAudio(audio);
}
- return sj.toString();
- }else{
- return null;
}
+ return mgtMemberFollowPageVoList;
}
}
--
Gitblit v1.7.1