联调bug和统计完善

jiangqs

2023-06-30 cbc564a7088503ad8cc7af4e1d2ba417d061e615

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

@@ -15,6 +15,8 @@
import com.ruoyi.shop.service.task.MemberTaskRecordService;
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.vo.MemberTaskSimpleVo;
import com.ruoyi.system.api.service.RemoteMemberService;
import org.springframework.stereotype.Service;

@@ -41,6 +43,11 @@

    @Resource
    private RemoteMemberService remoteMemberService;

    @Resource
    private TaskFileService taskFileService;


    /**
     *
     * @param page
@@ -72,7 +79,7 @@
    @Override
    public void createMemberTask(MerCreateMemberTaskDto merCreateMemberTaskDto){
        MemberTask memberTask = new MemberTask();
        String taskId = IdUtils.fastUUID();
        String taskId = IdUtils.simpleUUID();
        memberTask.setTaskId(taskId);
        memberTask.setDelFlag(0);
        memberTask.setTaskStatus(0);
@@ -98,6 +105,8 @@
        memberTaskRecord.setFollowType(merFollowMemberTaskDto.getFollowType());
        memberTaskRecord.setCallPhone(merFollowMemberTaskDto.getCallPhone());
        memberTaskRecord.setCallTime(merFollowMemberTaskDto.getCallTime());
        memberTaskRecord.setFollowContent(merFollowMemberTaskDto.getFollowContent());
        memberTaskRecord.setCreateTime(new Date());
        memberTaskRecordService.saveOrUpdate(memberTaskRecord);
        String picture = merFollowMemberTaskDto.getPicture();
        String video = merFollowMemberTaskDto.getVideo();
@@ -113,6 +122,7 @@
                taskFile.setFollowFrom(2);
                taskFile.setFileUrl(str);
                taskFile.setFileType(1);
                taskFileService.saveOrUpdate(taskFile);
            }
        }
        if(StringUtils.isNotBlank(video)){
@@ -124,6 +134,7 @@
                taskFile.setFollowFrom(2);
                taskFile.setFileUrl(str);
                taskFile.setFileType(2);
                taskFileService.saveOrUpdate(taskFile);
            }
        }
        if(StringUtils.isNotBlank(audio)){
@@ -135,11 +146,12 @@
                taskFile.setFollowFrom(2);
                taskFile.setFileUrl(str);
                taskFile.setFileType(3);
                taskFileService.saveOrUpdate(taskFile);
            }
        }
        if(StringUtils.isNotBlank(merFollowMemberTaskDto.getNextTaskDate())){
            MemberTask memberTask = new MemberTask();
            String taskId = IdUtils.fastUUID();
            String taskId = IdUtils.simpleUUID();
            memberTask.setTaskId(taskId);
            memberTask.setDelFlag(0);
            memberTask.setShopId(oldMemberTask.getShopId());
@@ -151,4 +163,28 @@
            this.saveOrUpdate(memberTask);
        }
    }

    /**
     * @description 获取进行中任务数
     * @author  jqs
     * @date    2023/6/26 13:45
     * @param shopId
     * @return  Integer
     */
    @Override
    public Integer getMemberIngTotal(Long shopId) {
        return memberTaskMapper.getMemberIngTotal(shopId);
    }

    /**
     * @description  获取最近任务
     * @author  jqs
     * @date    2023/6/29 18:25
     * @param
     * @return  MemberTaskSimpleVo
     */
    @Override
    public MemberTaskSimpleVo getLastMemberTask(Long userId){
        return memberTaskMapper.getLastMemberTask(userId);
    }
}