From 92da9546e1b37b06f78671b34389b1dec9dfadfc Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 06 六月 2023 13:57:42 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 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 880c02a..429daf2 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
@@ -53,10 +58,10 @@
String today = DateUtils.parseDateToStr("YYYY-MM-DD",new Date());
List<MerMemberTaskPageVo> merMemberTaskPageVoList = memberTaskMapper.pageMerMemberTask(page, merMemberTaskPageDto);
if(merMemberTaskPageVoList!=null&&!merMemberTaskPageVoList.isEmpty()){
- Date taskDate;
+ String taskDate;
for(MerMemberTaskPageVo merMemberTaskPageVo : merMemberTaskPageVoList){
taskDate = merMemberTaskPageVo.getTaskDate();
- if(today.equals(DateUtils.parseDateToStr("YYYY-MM-DD",taskDate))){
+ if(today.equals(taskDate)){
merMemberTaskPageVo.setTodayFlag(1);
}else{
merMemberTaskPageVo.setTodayFlag(0);
@@ -73,9 +78,10 @@
@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);
memberTask.setShopId(merCreateMemberTaskDto.getShopId());
memberTask.setUserId(merCreateMemberTaskDto.getMemberUserId());
memberTask.setTaskDate(merCreateMemberTaskDto.getTaskDate());
@@ -94,10 +100,12 @@
MemberTask oldMemberTask = this.getById(merFollowMemberTaskDto.getTaskId());
memberTaskRecord.setTaskId(merFollowMemberTaskDto.getTaskId());
memberTaskRecord.setDelFlag(0);
- memberTaskRecord.setUserId(oldMemberTask.getUserId());
+ memberTaskRecord.setUserId(merFollowMemberTaskDto.getUserId());
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 +121,7 @@
taskFile.setFollowFrom(2);
taskFile.setFileUrl(str);
taskFile.setFileType(1);
+ taskFileService.saveOrUpdate(taskFile);
}
}
if(StringUtils.isNotBlank(video)){
@@ -124,6 +133,7 @@
taskFile.setFollowFrom(2);
taskFile.setFileUrl(str);
taskFile.setFileType(2);
+ taskFileService.saveOrUpdate(taskFile);
}
}
if(StringUtils.isNotBlank(audio)){
@@ -135,18 +145,21 @@
taskFile.setFollowFrom(2);
taskFile.setFileUrl(str);
taskFile.setFileType(3);
+ taskFileService.saveOrUpdate(taskFile);
}
}
- MemberTask memberTask = new MemberTask();
- String taskId = IdUtils.fastUUID();
- memberTask.setTaskId(taskId);
- memberTask.setDelFlag(0);
- memberTask.setShopId(oldMemberTask.getShopId());
- memberTask.setUserId(oldMemberTask.getUserId());
- memberTask.setTaskDate(merFollowMemberTaskDto.getNextTaskDate());
- memberTask.setTaskContent(merFollowMemberTaskDto.getNextTaskContent());
- memberTask.setCreateTime(new Date());
- this.saveOrUpdate(memberTask);
-
+ if(StringUtils.isNotBlank(merFollowMemberTaskDto.getNextTaskDate())){
+ MemberTask memberTask = new MemberTask();
+ String taskId = IdUtils.simpleUUID();
+ memberTask.setTaskId(taskId);
+ memberTask.setDelFlag(0);
+ memberTask.setShopId(oldMemberTask.getShopId());
+ memberTask.setUserId(oldMemberTask.getUserId());
+ memberTask.setTaskDate(merFollowMemberTaskDto.getNextTaskDate());
+ memberTask.setTaskContent(merFollowMemberTaskDto.getNextTaskContent());
+ memberTask.setTaskStatus(2);
+ memberTask.setCreateTime(new Date());
+ this.saveOrUpdate(memberTask);
+ }
}
}
--
Gitblit v1.7.1