日志管理

jiangqs

2023-06-27 046d7ac5bbef4cbb6c6b64f3589e2722d13a07a5

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java

@@ -1,25 +1,21 @@
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 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;

/**
@@ -39,8 +35,6 @@
    @Resource
    private TaskFileService taskFileService;

    @Resource
    private ShopService shopService;
    /**
     * 商户分页获取会员跟进任务
     * @param page
@@ -79,21 +73,21 @@
    }

    /**
     * 平台分页获取会员跟进任务
     * @param page
     * @return
     * @description  平台分页获取会员跟进任务
     * @author  jqs
     * @date    2023/6/16 15:48
     * @param mgtMemberTaskPageDto
     * @return  List<MgtMemberFollowPageVo>
     */
    @Override
    public List<MgtMemberFollowPageVo> pageMgtMemberFollow(Page page){
        List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordMapper.pageMgtMemberFollow(page);
    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<>();
            Long shopId;
            Shop shop;
            for(MgtMemberFollowPageVo mgtMemberFollowPageVo : mgtMemberFollowPageVoList){
                followId = mgtMemberFollowPageVo.getFollowId();
                taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);