From b95715d5cdc806cbb15cc7f49c538e61f5ab5dc6 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:31:46 +0800
Subject: [PATCH] bug和二维码
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java | 70 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 18 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..ce11ce1 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
@@ -1,19 +1,22 @@
package com.ruoyi.shop.service.impl.task;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
+import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
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.task.MemberTaskRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.service.task.TaskFileService;
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 +35,8 @@
@Resource
private TaskFileService taskFileService;
-
/**
- *
+ * 商户分页获取会员跟进任务
* @param page
* @param merMemberTaskPageDto
* @return
@@ -45,17 +47,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 +72,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());
+ /**
+ * @description 平台分页获取会员跟进任务
+ * @author jqs
+ * @date 2023/6/16 15:48
+ * @param mgtMemberTaskPageDto
+ * @return List<MgtMemberFollowPageVo>
+ */
+ @Override
+ public List<MgtMemberFollowPageVo> pageMgtMemberFollow( MgtMemberTaskPageDto mgtMemberTaskPageDto){
+ 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<>();
+ 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