联调bug和统计完善

jiangqs

2023-06-30 cbc564a7088503ad8cc7af4e1d2ba417d061e615

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

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

@@ -55,7 +56,7 @@
     */
    @Override
    public List<MerMemberTaskPageVo> pageMerMemberTask(Page page, MerMemberTaskPageDto merMemberTaskPageDto){
        String today = DateUtils.parseDateToStr("YYYY-MM-DD",DateUtils.getNowDate());
        String today = DateUtils.parseDateToStr("YYYY-MM-DD",new Date());
        List<MerMemberTaskPageVo> merMemberTaskPageVoList = memberTaskMapper.pageMerMemberTask(page, merMemberTaskPageDto);
        if(merMemberTaskPageVoList!=null&&!merMemberTaskPageVoList.isEmpty()){
            String taskDate;
@@ -86,7 +87,7 @@
        memberTask.setUserId(merCreateMemberTaskDto.getMemberUserId());
        memberTask.setTaskDate(merCreateMemberTaskDto.getTaskDate());
        memberTask.setTaskContent(merCreateMemberTaskDto.getTaskContent());
        memberTask.setCreateTime(DateUtils.getNowDate());
        memberTask.setCreateTime(new Date());
        this.saveOrUpdate(memberTask);
    }

@@ -105,7 +106,7 @@
        memberTaskRecord.setCallPhone(merFollowMemberTaskDto.getCallPhone());
        memberTaskRecord.setCallTime(merFollowMemberTaskDto.getCallTime());
        memberTaskRecord.setFollowContent(merFollowMemberTaskDto.getFollowContent());
        memberTaskRecord.setCreateTime(DateUtils.getNowDate());
        memberTaskRecord.setCreateTime(new Date());
        memberTaskRecordService.saveOrUpdate(memberTaskRecord);
        String picture = merFollowMemberTaskDto.getPicture();
        String video = merFollowMemberTaskDto.getVideo();
@@ -158,8 +159,32 @@
            memberTask.setTaskDate(merFollowMemberTaskDto.getNextTaskDate());
            memberTask.setTaskContent(merFollowMemberTaskDto.getNextTaskContent());
            memberTask.setTaskStatus(2);
            memberTask.setCreateTime(DateUtils.getNowDate());
            memberTask.setCreateTime(new Date());
            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);
    }
}