bug

jiangqs

2023-07-31 122bb1142631e31ce50716495dba420102f58f56

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

@@ -81,9 +81,19 @@
    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());
@@ -160,7 +170,7 @@
            }
            // 判断视频是否为空，并处理
            if (StringUtils.isNotBlank(video)) {
                strArr = picture.split(",");
                strArr = video.split(",");
                for (String str : strArr) {
                    taskFile = new TaskFile();
                    taskFile.setDelFlag(0);
@@ -173,7 +183,7 @@
            }
            // 判断音频是否为空，并处理
            if (StringUtils.isNotBlank(audio)) {
                strArr = picture.split(",");
                strArr = audio.split(",");
                for (String str : strArr) {
                    taskFile = new TaskFile();
                    taskFile.setDelFlag(0);
@@ -187,6 +197,7 @@
        }
        // 判断下一个任务日期是否为空，并处理
        if (StringUtils.isNotBlank(merFollowMemberTaskDto.getNextTaskDate())) {
            String nowTimeStr = DateUtils.getDate();
            MemberTask memberTask = new MemberTask();
            String taskId = IdUtils.simpleUUID();
            memberTask.setTaskId(taskId);
@@ -195,7 +206,15 @@
            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);
        }
@@ -213,10 +232,7 @@
        return memberTaskMapper.getMemberIngTotal(shopId);
    }

    @Override
    public Integer getMembersIngTotal(List<Long> shopIds) {
        return memberTaskMapper.getMembersIngTotal(shopIds);
    }


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