From aed4e4c7d76de4d0fbfe8c0b26fcdeecbd5c5b24 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 26 五月 2023 18:04:47 +0800
Subject: [PATCH] 管理台用户管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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..f8f5bc9 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,7 @@
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.system.api.service.RemoteMemberService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -53,10 +52,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);
@@ -76,6 +75,7 @@
String taskId = IdUtils.fastUUID();
memberTask.setTaskId(taskId);
memberTask.setDelFlag(0);
+ memberTask.setTaskStatus(0);
memberTask.setShopId(merCreateMemberTaskDto.getShopId());
memberTask.setUserId(merCreateMemberTaskDto.getMemberUserId());
memberTask.setTaskDate(merCreateMemberTaskDto.getTaskDate());
@@ -94,7 +94,7 @@
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());
@@ -137,16 +137,18 @@
taskFile.setFileType(3);
}
}
- 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.fastUUID();
+ 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