From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 f8f5bc9..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,6 +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.shop.service.task.TaskFileService;
import com.ruoyi.system.api.service.RemoteMemberService;
import org.springframework.stereotype.Service;
@@ -41,6 +42,11 @@
@Resource
private RemoteMemberService remoteMemberService;
+
+ @Resource
+ private TaskFileService taskFileService;
+
+
/**
*
* @param page
@@ -72,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);
@@ -98,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();
@@ -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,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());
--
Gitblit v1.7.1