From d10302001c4a6776a190cf97a403dab3816ed4f9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 04 七月 2023 21:59:30 +0800
Subject: [PATCH] 用户端活动商品
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java | 117 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 66 insertions(+), 51 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 fe6a4b8..445e4a5 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
@@ -8,6 +8,7 @@
import com.ruoyi.shop.domain.dto.MerAgencyTaskPageDto;
import com.ruoyi.shop.domain.dto.MerCreateAgencyTaskDto;
import com.ruoyi.shop.domain.dto.MerFollowAgencyTaskDto;
+import com.ruoyi.shop.domain.dto.MerFollowPhoneDto;
import com.ruoyi.shop.domain.pojo.task.*;
import com.ruoyi.shop.domain.vo.MerAgencyTaskPageVo;
import com.ruoyi.shop.mapper.task.AgencyTaskMapper;
@@ -79,59 +80,75 @@
*/
@Override
public void followAgencyTask(MerFollowAgencyTaskDto merFollowAgencyTaskDto){
- AgencyTaskRecord agencyTaskRecord = new AgencyTaskRecord();
+ AgencyTaskRecord 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();
- String[] strArr;
- TaskFile taskFile;
- if(StringUtils.isNotBlank(picture)){
- strArr = picture.split(",");
- for(String str : strArr){
- taskFile = new TaskFile();
- taskFile.setDelFlag(0);
- taskFile.setFollowId(agencyTaskRecord.getId());
- taskFile.setFollowFrom(2);
- taskFile.setFileUrl(str);
- taskFile.setFileType(1);
- taskFileService.saveOrUpdate(taskFile);
+ oldAgencyTask.setTaskStatus(2);
+ this.saveOrUpdate(oldAgencyTask);
+ if(merFollowAgencyTaskDto.getFollowType()==1){
+ // 获取跟进电话列表
+ List<MerFollowPhoneDto> followPhone = merFollowAgencyTaskDto.getFollowPhone();
+ // 判断跟进电话列表是否为空
+ if (followPhone != null && !followPhone.isEmpty()) {
+ // 遍历跟进电话列表
+ for (MerFollowPhoneDto followPhoneDto : followPhone) {
+ // 创建新的会员任务记录
+ agencyTaskRecord = new AgencyTaskRecord();
+ //更新任务
+ agencyTaskRecord.setTaskId(merFollowAgencyTaskDto.getTaskId());
+ agencyTaskRecord.setDelFlag(0);
+ agencyTaskRecord.setUserId(merFollowAgencyTaskDto.getUserId());
+ agencyTaskRecord.setFollowType(merFollowAgencyTaskDto.getFollowType());
+ agencyTaskRecord.setCallPhone(merFollowAgencyTaskDto.getCallPhone());
+ agencyTaskRecord.setCallTime(followPhoneDto.getCallTime());
+ agencyTaskRecord.setFollowContent(followPhoneDto.getFollowContent());
+ agencyTaskRecord.setCreateTime(new Date());
+ agencyTaskRecordService.saveOrUpdate(agencyTaskRecord);
+ }
}
- }
- if(StringUtils.isNotBlank(video)){
- strArr = picture.split(",");
- for(String str : strArr){
- taskFile = new TaskFile();
- taskFile.setDelFlag(0);
- taskFile.setFollowId(agencyTaskRecord.getId());
- taskFile.setFollowFrom(2);
- taskFile.setFileUrl(str);
- taskFile.setFileType(2);
- taskFileService.saveOrUpdate(taskFile);
+ }else{
+ agencyTaskRecord = new AgencyTaskRecord();
+ //创建任务详情文件
+ String picture = merFollowAgencyTaskDto.getPicture();
+ String video = merFollowAgencyTaskDto.getVideo();
+ String audio = merFollowAgencyTaskDto.getAudio();
+ String[] strArr;
+ TaskFile taskFile;
+ if(StringUtils.isNotBlank(picture)){
+ strArr = picture.split(",");
+ for(String str : strArr){
+ taskFile = new TaskFile();
+ taskFile.setDelFlag(0);
+ taskFile.setFollowId(agencyTaskRecord.getId());
+ taskFile.setFollowFrom(2);
+ taskFile.setFileUrl(str);
+ taskFile.setFileType(1);
+ taskFileService.saveOrUpdate(taskFile);
+ }
+ }
+ if(StringUtils.isNotBlank(video)){
+ strArr = picture.split(",");
+ for(String str : strArr){
+ taskFile = new TaskFile();
+ taskFile.setDelFlag(0);
+ taskFile.setFollowId(agencyTaskRecord.getId());
+ taskFile.setFollowFrom(2);
+ taskFile.setFileUrl(str);
+ taskFile.setFileType(2);
+ taskFileService.saveOrUpdate(taskFile);
+ }
}
- }
- if(StringUtils.isNotBlank(audio)){
- strArr = picture.split(",");
- for(String str : strArr){
- taskFile = new TaskFile();
- taskFile.setDelFlag(0);
- taskFile.setFollowId(agencyTaskRecord.getId());
- taskFile.setFollowFrom(2);
- taskFile.setFileUrl(str);
- taskFile.setFileType(3);
- taskFileService.saveOrUpdate(taskFile);
+ if(StringUtils.isNotBlank(audio)){
+ strArr = picture.split(",");
+ for(String str : strArr){
+ taskFile = new TaskFile();
+ taskFile.setDelFlag(0);
+ taskFile.setFollowId(agencyTaskRecord.getId());
+ taskFile.setFollowFrom(2);
+ taskFile.setFileUrl(str);
+ taskFile.setFileType(3);
+ taskFileService.saveOrUpdate(taskFile);
+ }
}
}
//创建新任务
@@ -148,7 +165,5 @@
agencyTask.setCreateTime(new Date());
this.saveOrUpdate(agencyTask);
}
-
-
}
}
--
Gitblit v1.7.1