From efe79e640c4598f52c2d1032fcead000edf8049e Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期三, 28 六月 2023 10:29:53 +0800 Subject: [PATCH] 统计bug和验证优化 --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java index dccaa4a..fed1213 100644 --- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java @@ -15,8 +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.system.api.RemoteMemberService; -import com.ruoyi.system.api.domain.poji.member.Member; +import com.ruoyi.shop.service.task.TaskFileService; +import com.ruoyi.system.api.service.RemoteMemberService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -42,6 +42,11 @@ @Resource private RemoteMemberService remoteMemberService; + + @Resource + private TaskFileService taskFileService; + + /** * * @param page @@ -73,7 +78,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); @@ -99,6 +104,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(); @@ -114,6 +121,7 @@ taskFile.setFollowFrom(2); taskFile.setFileUrl(str); taskFile.setFileType(1); + taskFileService.saveOrUpdate(taskFile); } } if(StringUtils.isNotBlank(video)){ @@ -125,6 +133,7 @@ taskFile.setFollowFrom(2); taskFile.setFileUrl(str); taskFile.setFileType(2); + taskFileService.saveOrUpdate(taskFile); } } if(StringUtils.isNotBlank(audio)){ @@ -136,11 +145,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()); @@ -152,4 +162,17 @@ 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); + } + } -- Gitblit v1.7.1