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

jiangqs

2023-08-06 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f

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

@@ -17,6 +17,7 @@
import com.ruoyi.shop.service.task.MemberTaskService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.service.task.TaskFileService;
import com.ruoyi.system.api.domain.dto.MemberTotalChangeDto;
import com.ruoyi.system.api.domain.vo.MemberTaskSimpleVo;
import com.ruoyi.system.api.service.RemoteMemberService;
import org.springframework.stereotype.Service;
@@ -57,19 +58,7 @@
     */
    @Override
    public List<MerMemberTaskPageVo> pageMerMemberTask(Page page, MerMemberTaskPageDto merMemberTaskPageDto){
        String today = DateUtils.parseDateToStr("YYYY-MM-DD",new Date());
        List<MerMemberTaskPageVo> merMemberTaskPageVoList = memberTaskMapper.pageMerMemberTask(page, merMemberTaskPageDto);
        if(merMemberTaskPageVoList!=null&&!merMemberTaskPageVoList.isEmpty()){
            String taskDate;
            for(MerMemberTaskPageVo merMemberTaskPageVo : merMemberTaskPageVoList){
                taskDate = merMemberTaskPageVo.getTaskDate();
                if(today.equals(taskDate)){
                    merMemberTaskPageVo.setTodayFlag(1);
                }else{
                    merMemberTaskPageVo.setTodayFlag(0);
                }
            }
        }
        return merMemberTaskPageVoList;
    }

@@ -81,15 +70,28 @@
    public void createMemberTask(MerCreateMemberTaskDto merCreateMemberTaskDto){
        MemberTask memberTask = new MemberTask();
        String taskId = IdUtils.simpleUUID();
        String nowTimeStr = DateUtils.getDate();
        memberTask.setTaskId(taskId);
        memberTask.setDelFlag(0);
        memberTask.setTaskStatus(0);
        int i = merCreateMemberTaskDto.getTaskDate().compareTo(nowTimeStr);
        if(i>0){
            memberTask.setTaskStatus(0);
        }else if(i==0){
            memberTask.setTaskStatus(1);
        }else{
            memberTask.setTaskStatus(3);
        }
        memberTask.setEmergencyState(merCreateMemberTaskDto.getEmergencyState());
        memberTask.setShopId(merCreateMemberTaskDto.getShopId());
        memberTask.setUserId(merCreateMemberTaskDto.getMemberUserId());
        memberTask.setTaskDate(merCreateMemberTaskDto.getTaskDate());
        memberTask.setTaskContent(merCreateMemberTaskDto.getTaskContent());
        memberTask.setCreateTime(new Date());
        this.saveOrUpdate(memberTask);
        MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
        memberTotalChangeDto.setNextTaskTime(merCreateMemberTaskDto.getTaskDate());
        remoteMemberService.changeMemberTotal(memberTotalChangeDto);
    }

    /**
@@ -121,6 +123,7 @@
                    memberTaskRecord.setDelFlag(0);
                    memberTaskRecord.setUserId(merFollowMemberTaskDto.getUserId());
                    memberTaskRecord.setFollowType(merFollowMemberTaskDto.getFollowType());
                    memberTaskRecord.setCustomeFollowType(merFollowMemberTaskDto.getCustomeFollowType());
                    memberTaskRecord.setCallPhone(merFollowMemberTaskDto.getCallPhone());
                    memberTaskRecord.setFollowContent(followPhoneDto.getFollowContent());
                    memberTaskRecord.setCallTime(followPhoneDto.getCallTime());
@@ -135,6 +138,7 @@
            memberTaskRecord.setDelFlag(0);
            memberTaskRecord.setUserId(merFollowMemberTaskDto.getUserId());
            memberTaskRecord.setFollowType(merFollowMemberTaskDto.getFollowType());
            memberTaskRecord.setCustomeFollowType(merFollowMemberTaskDto.getCustomeFollowType());
            memberTaskRecord.setFollowContent(merFollowMemberTaskDto.getFollowContent());
            memberTaskRecord.setCreateTime(new Date());
            // 保存或更新会员任务记录
@@ -160,7 +164,7 @@
            }
            // 判断视频是否为空，并处理
            if (StringUtils.isNotBlank(video)) {
                strArr = picture.split(",");
                strArr = video.split(",");
                for (String str : strArr) {
                    taskFile = new TaskFile();
                    taskFile.setDelFlag(0);
@@ -173,7 +177,7 @@
            }
            // 判断音频是否为空，并处理
            if (StringUtils.isNotBlank(audio)) {
                strArr = picture.split(",");
                strArr = audio.split(",");
                for (String str : strArr) {
                    taskFile = new TaskFile();
                    taskFile.setDelFlag(0);
@@ -187,6 +191,7 @@
        }
        // 判断下一个任务日期是否为空，并处理
        if (StringUtils.isNotBlank(merFollowMemberTaskDto.getNextTaskDate())) {
            String nowTimeStr = DateUtils.getDate();
            MemberTask memberTask = new MemberTask();
            String taskId = IdUtils.simpleUUID();
            memberTask.setTaskId(taskId);
@@ -195,9 +200,20 @@
            memberTask.setUserId(oldMemberTask.getUserId());
            memberTask.setTaskDate(merFollowMemberTaskDto.getNextTaskDate());
            memberTask.setTaskContent(merFollowMemberTaskDto.getNextTaskContent());
            memberTask.setTaskStatus(2);
            memberTask.setEmergencyState(merFollowMemberTaskDto.getEmergencyState());
            int i = merFollowMemberTaskDto.getNextTaskDate().compareTo(nowTimeStr);
            if(i>0){
                memberTask.setTaskStatus(0);
            }else if(i==0){
                memberTask.setTaskStatus(1);
            }else{
                memberTask.setTaskStatus(3);
            }
            memberTask.setCreateTime(new Date());
            this.saveOrUpdate(memberTask);
            MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
            memberTotalChangeDto.setNextTaskTime(merFollowMemberTaskDto.getNextTaskDate());
            remoteMemberService.changeMemberTotal(memberTotalChangeDto);
        }
    }

@@ -213,6 +229,8 @@
        return memberTaskMapper.getMemberIngTotal(shopId);
    }



    /**
     * @description  获取最近任务
     * @author  jqs