From b95715d5cdc806cbb15cc7f49c538e61f5ab5dc6 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:31:46 +0800
Subject: [PATCH] bug和二维码
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java | 194 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 172 insertions(+), 22 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
index 86adad3..f949202 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
@@ -6,12 +6,8 @@
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
-import com.ruoyi.shop.domain.dto.MgtFollowShopTaskDto;
-import com.ruoyi.shop.domain.dto.StaffAddTaskDto;
-import com.ruoyi.shop.domain.dto.StaffShopTaskPageDto;
-import com.ruoyi.shop.domain.pojo.task.ShopTask;
-import com.ruoyi.shop.domain.pojo.task.ShopTaskRecord;
-import com.ruoyi.shop.domain.pojo.task.TaskFile;
+import com.ruoyi.shop.domain.dto.*;
+import com.ruoyi.shop.domain.pojo.task.*;
import com.ruoyi.shop.domain.vo.StaffShopTaskPageVo;
import com.ruoyi.shop.mapper.task.ShopTaskMapper;
import com.ruoyi.shop.service.task.ShopTaskRecordService;
@@ -23,8 +19,6 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.text.ParseException;
-import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@@ -59,15 +53,16 @@
public void followShopTask(MgtFollowShopTaskDto mgtFollowShopTaskDto){
//创建本次任务
ShopTask shopTask = new ShopTask();
+ Date nowTime = new Date();
+ String nowTimeStr = DateUtils.getDate();
String taskId = IdUtils.simpleUUID();
shopTask.setTaskId(taskId);
shopTask.setDelFlag(0);
shopTask.setShopId(mgtFollowShopTaskDto.getShopId());
- shopTask.setNextFollowDate(DateUtils.toDate(LocalDate.now()));
shopTask.setTaskTitle(mgtFollowShopTaskDto.getTaskTitle());
shopTask.setEmergencyState(mgtFollowShopTaskDto.getEmergencyState());
- shopTask.setCreateTime(new Date());
- shopTask.setTaskDate(DateUtils.toDate(LocalDate.now()));
+ shopTask.setCreateTime(nowTime);
+ shopTask.setTaskDate(nowTimeStr);
shopTask.setTaskStatus(2);
this.saveOrUpdate(shopTask);
//创建任务记录
@@ -78,7 +73,7 @@
shopTaskRecord.setFollowType(2);
shopTaskRecord.setCustomFollowType(mgtFollowShopTaskDto.getFollowType());
shopTaskRecord.setFollowContent(mgtFollowShopTaskDto.getFollowContent());
- shopTaskRecord.setCreateTime(new Date());
+ shopTaskRecord.setCreateTime(nowTime);
shopTaskRecordService.saveOrUpdate(shopTaskRecord);
//创建任务文件
String picture = mgtFollowShopTaskDto.getPicture();
@@ -104,14 +99,16 @@
shopNextTask.setShopId(mgtFollowShopTaskDto.getShopId());
shopNextTask.setTaskTitle(mgtFollowShopTaskDto.getNextTaskTitle());
shopNextTask.setEmergencyState(mgtFollowShopTaskDto.getEmergencyState());
- shopNextTask.setCreateTime(new Date());
- shopNextTask.setTaskStatus(0);
- try {
- shopNextTask.setNextFollowDate(DateUtils.parseDate(mgtFollowShopTaskDto.getNextTaskDate(),"yyyy-MM-dd"));
- shopNextTask.setTaskDate(DateUtils.parseDate(mgtFollowShopTaskDto.getNextTaskDate(),"yyyy-MM-dd"));
- } catch (ParseException e) {
- throw new RuntimeException(e);
+ shopNextTask.setCreateTime(nowTime);
+ int i = mgtFollowShopTaskDto.getNextTaskDate().compareTo(nowTimeStr);
+ if(i>0){
+ shopNextTask.setTaskStatus(0);
+ }else if(i==0){
+ shopNextTask.setTaskStatus(1);
+ }else{
+ shopNextTask.setTaskStatus(3);
}
+ shopNextTask.setTaskDate(mgtFollowShopTaskDto.getNextTaskDate());
this.saveOrUpdate(shopNextTask);
}
@@ -162,9 +159,11 @@
for(StaffShopTaskPageVo staffShopTaskPageVo : shopTaskPageVoList){
//获取任务用户信息
userId = staffShopTaskPageVo.getUserId();
- sysUser = remoteUserService.getSysUser(userId).getData();
- staffShopTaskPageVo.setUserName(sysUser.getNickName());
- staffShopTaskPageVo.setUserPicture(sysUser.getAvatar());
+ if(userId!=null){
+ sysUser = remoteUserService.getSysUser(userId).getData();
+ staffShopTaskPageVo.setUserName(sysUser.getNickName());
+ staffShopTaskPageVo.setUserPicture(sysUser.getAvatar());
+ }
}
}
return shopTaskPageVoList;
@@ -180,5 +179,156 @@
@Override
public void staffAddTask(StaffAddTaskDto staffAddTaskDto){
ShopTask shopTask = new ShopTask();
+ String nowTimeStr = DateUtils.getDate();
+ String taskId = IdUtils.simpleUUID();
+ shopTask.setTaskId(taskId);
+ shopTask.setDelFlag(0);
+ shopTask.setShopId(staffAddTaskDto.getShopId());
+ shopTask.setTaskTitle(staffAddTaskDto.getTaskTitle());
+ shopTask.setEmergencyState(staffAddTaskDto.getEmergencyState());
+ shopTask.setCreateTime(new Date());
+ shopTask.setTaskDate(staffAddTaskDto.getTaskDate());
+ int i = staffAddTaskDto.getTaskDate().compareTo(nowTimeStr);
+ if(i>0){
+ shopTask.setTaskStatus(0);
+ }else if(i==0){
+ shopTask.setTaskStatus(1);
+ }else{
+ shopTask.setTaskStatus(3);
+ }
+ this.saveOrUpdate(shopTask);
+ }
+
+ /**
+ * @description 员工商户任务跟进
+ * @param staffFollowShopTaskDto
+ * @return void
+ * @author jqs34
+ * @date 2023/7/16 11:56
+ */
+ @Override
+ public void staffFollowShopTask(StaffFollowShopTaskDto staffFollowShopTaskDto){
+ // 创建会员任务记录对象
+ ShopTaskRecord shopTaskRecord;
+ // 获取旧的会员任务
+ ShopTask oldShopTask = this.getById(staffFollowShopTaskDto.getTaskId());
+ oldShopTask.setTaskStatus(2);
+ this.saveOrUpdate(oldShopTask);
+ // 判断跟进类型
+ if (staffFollowShopTaskDto.getFollowType() == 1) {
+ // 获取跟进电话列表
+ List<MerFollowPhoneDto> followPhone = staffFollowShopTaskDto.getFollowPhone();
+ // 判断跟进电话列表是否为空
+ if (followPhone != null && !followPhone.isEmpty()) {
+ // 遍历跟进电话列表
+ for (MerFollowPhoneDto followPhoneDto : followPhone) {
+ // 创建新的会员任务记录
+ shopTaskRecord = new ShopTaskRecord();
+ shopTaskRecord.setTaskId(staffFollowShopTaskDto.getTaskId());
+ shopTaskRecord.setDelFlag(0);
+ shopTaskRecord.setUserId(staffFollowShopTaskDto.getUserId());
+ shopTaskRecord.setFollowType(staffFollowShopTaskDto.getFollowType());
+ shopTaskRecord.setCallPhone(staffFollowShopTaskDto.getCallPhone());
+ shopTaskRecord.setFollowContent(followPhoneDto.getFollowContent());
+ shopTaskRecord.setCallTime(followPhoneDto.getCallTime());
+ shopTaskRecord.setCreateTime(new Date());
+ // 保存或更新会员任务记录
+ shopTaskRecordService.saveOrUpdate(shopTaskRecord);
+ }
+ }
+ } else {
+ // 创建新的会员任务记录
+ shopTaskRecord = new ShopTaskRecord();
+ shopTaskRecord.setTaskId(staffFollowShopTaskDto.getTaskId());
+ shopTaskRecord.setDelFlag(0);
+ shopTaskRecord.setUserId(staffFollowShopTaskDto.getUserId());
+ shopTaskRecord.setFollowType(staffFollowShopTaskDto.getFollowType());
+ shopTaskRecord.setFollowContent(staffFollowShopTaskDto.getFollowContent());
+ shopTaskRecord.setCustomFollowType(staffFollowShopTaskDto.getCustomFollowType());
+ shopTaskRecord.setCreateTime(new Date());
+ // 保存或更新会员任务记录
+ shopTaskRecordService.saveOrUpdate(shopTaskRecord);
+ // 获取图片、视频和音频
+ String picture = staffFollowShopTaskDto.getPicture();
+ String video = staffFollowShopTaskDto.getVideo();
+ String audio = staffFollowShopTaskDto.getAudio();
+ String[] strArr;
+ TaskFile taskFile;
+ // 判断图片是否为空，并处理
+ if (StringUtils.isNotBlank(picture)) {
+ strArr = picture.split(",");
+ for (String str : strArr) {
+ taskFile = new TaskFile();
+ taskFile.setDelFlag(0);
+ taskFile.setFollowId(shopTaskRecord.getId());
+ taskFile.setFollowFrom(4);
+ taskFile.setFileUrl(str);
+ taskFile.setFileType(1);
+ taskFileService.saveOrUpdate(taskFile);
+ }
+ }
+ // 判断视频是否为空，并处理
+ if (StringUtils.isNotBlank(video)) {
+ strArr = video.split(",");
+ for (String str : strArr) {
+ taskFile = new TaskFile();
+ taskFile.setDelFlag(0);
+ taskFile.setFollowId(shopTaskRecord.getId());
+ taskFile.setFollowFrom(4);
+ taskFile.setFileUrl(str);
+ taskFile.setFileType(2);
+ taskFileService.saveOrUpdate(taskFile);
+ }
+ }
+ // 判断音频是否为空，并处理
+ if (StringUtils.isNotBlank(audio)) {
+ strArr = audio.split(",");
+ for (String str : strArr) {
+ taskFile = new TaskFile();
+ taskFile.setDelFlag(0);
+ taskFile.setFollowId(shopTaskRecord.getId());
+ taskFile.setFollowFrom(4);
+ taskFile.setFileUrl(str);
+ taskFile.setFileType(3);
+ taskFileService.saveOrUpdate(taskFile);
+ }
+ }
+ }
+ // 判断下一个任务日期是否为空，并处理
+ if (StringUtils.isNotBlank(staffFollowShopTaskDto.getNextTaskDate())) {
+ ShopTask shopTask = new ShopTask();
+ String taskId = IdUtils.simpleUUID();
+ shopTask.setTaskId(taskId);
+ shopTask.setDelFlag(0);
+ shopTask.setShopId(oldShopTask.getShopId());
+ shopTask.setTaskDate(staffFollowShopTaskDto.getNextTaskDate());
+ shopTask.setFollowContent(staffFollowShopTaskDto.getNextTaskContent());
+ String nowTimeStr = DateUtils.getDate();
+ int i = staffFollowShopTaskDto.getNextTaskDate().compareTo(nowTimeStr);
+ if(i>0){
+ shopTask.setTaskStatus(0);
+ }else if(i==0){
+ shopTask.setTaskStatus(1);
+ }else{
+ shopTask.setTaskStatus(3);
+ }
+ shopTask.setEmergencyState(staffFollowShopTaskDto.getEmergencyState());
+ shopTask.setCreateTime(new Date());
+ this.saveOrUpdate(shopTask);
+ }
+ }
+
+ /**
+ * @description 检查任务时间状态
+ * @author jqs
+ * @date 2023/7/19 18:01
+ * @param
+ * @return void
+ */
+ @Override
+ public void checkTaskDateStatus(){
+ shopTaskMapper.checkShopTaskStatus();
+ shopTaskMapper.checkAgencyTaskStatus();
+ shopTaskMapper.checkMemberTaskStatus();
}
}
--
Gitblit v1.7.1