From 30bc5274884e0f6d11580f9d3af9e71d7a320888 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 24 八月 2023 19:03:10 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java | 56 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 23 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 a42b60e..3ba3861 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
@@ -4,10 +4,7 @@
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.MerCreateMemberTaskDto;
-import com.ruoyi.shop.domain.dto.MerFollowMemberTaskDto;
-import com.ruoyi.shop.domain.dto.MerFollowPhoneDto;
-import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
+import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.task.MemberTask;
import com.ruoyi.shop.domain.pojo.task.MemberTaskRecord;
import com.ruoyi.shop.domain.pojo.task.TaskFile;
@@ -23,6 +20,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -59,6 +57,15 @@
@Override
public List<MerMemberTaskPageVo> pageMerMemberTask(Page page, MerMemberTaskPageDto merMemberTaskPageDto){
List<MerMemberTaskPageVo> merMemberTaskPageVoList = memberTaskMapper.pageMerMemberTask(page, merMemberTaskPageDto);
+ List<String> dealContent = new ArrayList<>();
+ if(merMemberTaskPageVoList!=null&&!merMemberTaskPageVoList.isEmpty() ){
+ for(MerMemberTaskPageVo merMemberTaskPageVo : merMemberTaskPageVoList){
+ dealContent = memberTaskMapper.listDealContent(merMemberTaskPageVo.getTaskId());
+ if(dealContent!=null&&!dealContent.isEmpty()){
+ merMemberTaskPageVo.setDealContent(dealContent);
+ }
+ }
+ }
return merMemberTaskPageVoList;
}
@@ -145,50 +152,53 @@
// 保存或更新会员任务记录
memberTaskRecordService.saveOrUpdate(memberTaskRecord);
// 获取图片、视频和音频
- String picture = merFollowMemberTaskDto.getPicture();
- String video = merFollowMemberTaskDto.getVideo();
- String audio = merFollowMemberTaskDto.getAudio();
- String[] strArr;
+ List<FileDto> picture = merFollowMemberTaskDto.getPicture();
+ List<FileDto> video = merFollowMemberTaskDto.getVideo();
+ List<FileDto> audio = merFollowMemberTaskDto.getAudio();
TaskFile taskFile;
+ List<TaskFile> taskFileList = new ArrayList<>();
// 判断图片是否为空，并处理
- if (StringUtils.isNotBlank(picture)) {
- strArr = picture.split(",");
- for (String str : strArr) {
+ if (picture!=null&&!picture.isEmpty()) {
+ for (FileDto fileDto : picture) {
taskFile = new TaskFile();
taskFile.setDelFlag(0);
taskFile.setFollowId(memberTaskRecord.getId());
taskFile.setFollowFrom(2);
- taskFile.setFileUrl(str);
+ taskFile.setFileName(fileDto.getFileName());
+ taskFile.setFileUrl(fileDto.getFileUrl());
taskFile.setFileType(1);
- taskFileService.saveOrUpdate(taskFile);
+ taskFileList.add(taskFile);
}
}
// 判断视频是否为空，并处理
- if (StringUtils.isNotBlank(video)) {
- strArr = video.split(",");
- for (String str : strArr) {
+ if (video!=null&&!video.isEmpty()) {
+ for (FileDto fileDto : video) {
taskFile = new TaskFile();
taskFile.setDelFlag(0);
taskFile.setFollowId(memberTaskRecord.getId());
taskFile.setFollowFrom(2);
- taskFile.setFileUrl(str);
+ taskFile.setFileName(fileDto.getFileName());
+ taskFile.setFileUrl(fileDto.getFileUrl());
taskFile.setFileType(2);
- taskFileService.saveOrUpdate(taskFile);
+ taskFileList.add(taskFile);
}
}
// 判断音频是否为空，并处理
- if (StringUtils.isNotBlank(audio)) {
- strArr = audio.split(",");
- for (String str : strArr) {
+ if (audio!=null&&!audio.isEmpty()) {
+ for (FileDto fileDto : audio) {
taskFile = new TaskFile();
taskFile.setDelFlag(0);
taskFile.setFollowId(memberTaskRecord.getId());
taskFile.setFollowFrom(2);
- taskFile.setFileUrl(str);
+ taskFile.setFileName(fileDto.getFileName());
+ taskFile.setFileUrl(fileDto.getFileUrl());
taskFile.setFileType(3);
- taskFileService.saveOrUpdate(taskFile);
+ taskFileList.add(taskFile);
}
}
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ taskFileService.saveBatch(taskFileList);
+ }
}
// 判断下一个任务日期是否为空，并处理
if (StringUtils.isNotBlank(merFollowMemberTaskDto.getNextTaskDate())) {
--
Gitblit v1.7.1