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/AgencyTaskServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
index 18f1c45..fe6a4b8 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
@@ -13,6 +13,7 @@
import com.ruoyi.shop.mapper.task.AgencyTaskMapper;
import com.ruoyi.shop.service.task.AgencyTaskRecordService;
import com.ruoyi.shop.service.task.AgencyTaskService;
+import com.ruoyi.shop.service.task.TaskFileService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -35,6 +36,9 @@
@Resource
private AgencyTaskRecordService agencyTaskRecordService;
+
+ @Resource
+ private TaskFileService taskFileService;
/**
*
* @param page
@@ -57,7 +61,7 @@
public void createAgencyTask(MerCreateAgencyTaskDto merCreateAgencyTaskDto){
AgencyTask agencyTask = new AgencyTask();
- String taskId = IdUtils.fastUUID();
+ String taskId = IdUtils.simpleUUID();
agencyTask.setTaskId(taskId);
agencyTask.setDelFlag(0);
agencyTask.setTaskStatus(0);
@@ -77,13 +81,17 @@
public void followAgencyTask(MerFollowAgencyTaskDto merFollowAgencyTaskDto){
AgencyTaskRecord agencyTaskRecord = new AgencyTaskRecord();
AgencyTask oldAgencyTask = this.getById(merFollowAgencyTaskDto.getTaskId());
+ //更新任务
agencyTaskRecord.setTaskId(merFollowAgencyTaskDto.getTaskId());
agencyTaskRecord.setDelFlag(0);
agencyTaskRecord.setUserId(merFollowAgencyTaskDto.getUserId());
agencyTaskRecord.setFollowType(merFollowAgencyTaskDto.getFollowType());
agencyTaskRecord.setCallPhone(merFollowAgencyTaskDto.getCallPhone());
agencyTaskRecord.setCallTime(merFollowAgencyTaskDto.getCallTime());
+ agencyTaskRecord.setFollowContent(merFollowAgencyTaskDto.getFollowContent());
+ agencyTaskRecord.setCreateTime(new Date());
agencyTaskRecordService.saveOrUpdate(agencyTaskRecord);
+ //创建任务详情文件
String picture = merFollowAgencyTaskDto.getPicture();
String video = merFollowAgencyTaskDto.getVideo();
String audio = merFollowAgencyTaskDto.getAudio();
@@ -98,6 +106,7 @@
taskFile.setFollowFrom(2);
taskFile.setFileUrl(str);
taskFile.setFileType(1);
+ taskFileService.saveOrUpdate(taskFile);
}
}
if(StringUtils.isNotBlank(video)){
@@ -109,6 +118,8 @@
taskFile.setFollowFrom(2);
taskFile.setFileUrl(str);
taskFile.setFileType(2);
+ taskFileService.saveOrUpdate(taskFile);
+
}
}
if(StringUtils.isNotBlank(audio)){
@@ -120,11 +131,13 @@
taskFile.setFollowFrom(2);
taskFile.setFileUrl(str);
taskFile.setFileType(3);
+ taskFileService.saveOrUpdate(taskFile);
}
}
+ //创建新任务
if(StringUtils.isNotBlank(merFollowAgencyTaskDto.getNextTaskDate())){
AgencyTask agencyTask = new AgencyTask();
- String taskId = IdUtils.fastUUID();
+ String taskId = IdUtils.simpleUUID();
agencyTask.setTaskId(taskId);
agencyTask.setDelFlag(0);
agencyTask.setShopId(oldAgencyTask.getShopId());
--
Gitblit v1.7.1