Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

44323

2024-01-24 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c

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

@@ -7,21 +7,24 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.task.*;
import com.ruoyi.shop.domain.pojo.task.ShopTask;
import com.ruoyi.shop.domain.pojo.task.ShopTaskRecord;
import com.ruoyi.shop.domain.pojo.task.TaskFile;
import com.ruoyi.shop.domain.vo.StaffShopTaskPageVo;
import com.ruoyi.shop.mapper.task.ShopTaskMapper;
import com.ruoyi.shop.service.task.ShopTaskRecordService;
import com.ruoyi.shop.service.task.ShopTaskService;
import com.ruoyi.shop.service.task.TaskFileService;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.poji.sys.SysStaff;
import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteUserService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;

/**
 * <p>
@@ -45,6 +48,9 @@

    @Resource
    private RemoteUserService remoteUserService;

    @Resource
    private RemoteConfigService remoteConfigService;

    /**
     * 平台跟进商户
@@ -156,14 +162,23 @@
        List<StaffShopTaskPageVo> shopTaskPageVoList = shopTaskMapper.pageStaffShopTask(page, staffShopTaskPageDto);
        if(shopTaskPageVoList!=null&&shopTaskPageVoList.size()>0){
            Long userId;
            SysUser sysUser;
            SysStaff sysStaff;
            HashSet<Long> userIdSet = new HashSet<>();
            for(StaffShopTaskPageVo staffShopTaskPageVo : shopTaskPageVoList){
                userIdSet.add(staffShopTaskPageVo.getUserId());
            }
            List<Long> useIdList = new ArrayList<>(userIdSet);
            List<SysStaff> sysStaffList = remoteConfigService.listSysStaffByIds(useIdList).getData();
            Map<Long,SysStaff> sysStaffMap = sysStaffList.stream()
                    .collect(Collectors.toMap(SysStaff::getUserId, Function.identity()));
            for(StaffShopTaskPageVo staffShopTaskPageVo : shopTaskPageVoList){
                //获取任务用户信息
                userId = staffShopTaskPageVo.getUserId();
                if(userId!=null){
                    sysUser = remoteUserService.getSysUser(userId).getData();
                    staffShopTaskPageVo.setUserName(sysUser.getNickName());
                    staffShopTaskPageVo.setUserPicture(sysUser.getAvatar());
                    sysStaff = sysStaffMap.get(userId);
                    staffShopTaskPageVo.setUserName(sysStaff.getStaffName());
                    staffShopTaskPageVo.setUserPicture(sysStaff.getStaffAvatar());
                    staffShopTaskPageVo.setUserPosition(sysStaff.getStaffPost());
                }
            }
        }
@@ -189,6 +204,7 @@
        shopTask.setEmergencyState(staffAddTaskDto.getEmergencyState());
        shopTask.setCreateTime(new Date());
        shopTask.setTaskDate(staffAddTaskDto.getTaskDate());
        //任务状态
        int i = staffAddTaskDto.getTaskDate().compareTo(nowTimeStr);
        if(i>0){
            shopTask.setTaskStatus(0);
@@ -306,7 +322,7 @@
            shopTask.setDelFlag(0);
            shopTask.setShopId(oldShopTask.getShopId());
            shopTask.setTaskDate(staffFollowShopTaskDto.getNextTaskDate());
            shopTask.setFollowContent(staffFollowShopTaskDto.getNextTaskContent());
            shopTask.setTaskTitle(staffFollowShopTaskDto.getNextTaskContent());
            String nowTimeStr = DateUtils.getDate();
            int i = staffFollowShopTaskDto.getNextTaskDate().compareTo(nowTimeStr);
            if(i>0){
@@ -331,8 +347,11 @@
     */
    @Override
    public void checkTaskDateStatus(){
        //平台-商户任务状态
        shopTaskMapper.checkShopTaskStatus();
        //商户-代理商任务状态
        shopTaskMapper.checkAgencyTaskStatus();
        //商户-会员任务状态
        shopTaskMapper.checkMemberTaskStatus();
    }