From 3f7a3aefe2965459aed169383b285fba400cfe8c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 04 六月 2023 13:13:54 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 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 d628dce..b639b88 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,21 +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.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 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;
/**
@@ -35,9 +36,10 @@
@Resource
private TaskFileService taskFileService;
-
+ @Resource
+ private ShopService shopService;
/**
- *
+ * 商户分页获取会员跟进任务
* @param page
* @param merMemberTaskPageDto
* @return
@@ -73,4 +75,39 @@
return merMemberTaskRecordPageVoList;
}
+ /**
+ * 平台分页获取会员跟进任务
+ * @param page
+ * @return
+ */
+ @Override
+ public List<MgtMemberFollowPageVo> pageMgtMemberFollow(Page page, MgtMemberTaskPageDto mgtMemberTaskPageDto){
+ List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordMapper.pageMgtMemberFollow(page, 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 mgtMemberFollowPageVoList;
+ }
}
--
Gitblit v1.7.1