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 | 145 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 145 insertions(+), 0 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 6294833..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
@@ -1,10 +1,27 @@
package com.ruoyi.shop.service.impl.task;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.MerMemberTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.MemberTask;
+import com.ruoyi.shop.domain.pojo.task.MemberTaskRecord;
+import com.ruoyi.shop.domain.pojo.task.TaskFile;
+import com.ruoyi.shop.domain.vo.MerMemberTaskPageVo;
import com.ruoyi.shop.mapper.task.MemberTaskMapper;
+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;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -17,4 +34,132 @@
@Service
public class MemberTaskServiceImpl extends ServiceImpl<MemberTaskMapper, MemberTask> implements MemberTaskService {
+ @Resource
+ private MemberTaskMapper memberTaskMapper;
+
+ @Resource
+ private MemberTaskRecordService memberTaskRecordService;
+
+ @Resource
+ private RemoteMemberService remoteMemberService;
+
+ @Resource
+ private TaskFileService taskFileService;
+
+
+ /**
+ *
+ * @param page
+ * @param merMemberTaskPageDto
+ * @return
+ */
+ @Override
+ public List<MerMemberTaskPageVo> pageMerMemberTask(Page page, MerMemberTaskPageDto merMemberTaskPageDto){
+ String today = DateUtils.parseDateToStr("YYYY-MM-DD",new Date());
+ List<MerMemberTaskPageVo> merMemberTaskPageVoList = memberTaskMapper.pageMerMemberTask(page, merMemberTaskPageDto);
+ if(merMemberTaskPageVoList!=null&&!merMemberTaskPageVoList.isEmpty()){
+ String taskDate;
+ for(MerMemberTaskPageVo merMemberTaskPageVo : merMemberTaskPageVoList){
+ taskDate = merMemberTaskPageVo.getTaskDate();
+ if(today.equals(taskDate)){
+ merMemberTaskPageVo.setTodayFlag(1);
+ }else{
+ merMemberTaskPageVo.setTodayFlag(0);
+ }
+ }
+ }
+ return merMemberTaskPageVoList;
+ }
+
+ /**
+ *
+ * @param merCreateMemberTaskDto
+ */
+ @Override
+ public void createMemberTask(MerCreateMemberTaskDto merCreateMemberTaskDto){
+ MemberTask memberTask = new MemberTask();
+ String taskId = IdUtils.simpleUUID();
+ memberTask.setTaskId(taskId);
+ memberTask.setDelFlag(0);
+ memberTask.setTaskStatus(0);
+ memberTask.setShopId(merCreateMemberTaskDto.getShopId());
+ memberTask.setUserId(merCreateMemberTaskDto.getMemberUserId());
+ memberTask.setTaskDate(merCreateMemberTaskDto.getTaskDate());
+ memberTask.setTaskContent(merCreateMemberTaskDto.getTaskContent());
+ memberTask.setCreateTime(new Date());
+ this.saveOrUpdate(memberTask);
+ }
+
+ /**
+ *
+ * @param merFollowMemberTaskDto
+ */
+ @Override
+ public void followMemberTask(MerFollowMemberTaskDto merFollowMemberTaskDto){
+ MemberTaskRecord memberTaskRecord = new MemberTaskRecord();
+ MemberTask oldMemberTask = this.getById(merFollowMemberTaskDto.getTaskId());
+ memberTaskRecord.setTaskId(merFollowMemberTaskDto.getTaskId());
+ memberTaskRecord.setDelFlag(0);
+ memberTaskRecord.setUserId(merFollowMemberTaskDto.getUserId());
+ 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();
+ String audio = merFollowMemberTaskDto.getAudio();
+ String[] strArr;
+ TaskFile taskFile;
+ if(StringUtils.isNotBlank(picture)){
+ strArr = picture.split(",");
+ for(String str : strArr){
+ taskFile = new TaskFile();
+ taskFile.setDelFlag(0);
+ taskFile.setFollowId(memberTaskRecord.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(memberTaskRecord.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(memberTaskRecord.getId());
+ taskFile.setFollowFrom(2);
+ taskFile.setFileUrl(str);
+ taskFile.setFileType(3);
+ taskFileService.saveOrUpdate(taskFile);
+ }
+ }
+ if(StringUtils.isNotBlank(merFollowMemberTaskDto.getNextTaskDate())){
+ MemberTask memberTask = new MemberTask();
+ String taskId = IdUtils.simpleUUID();
+ memberTask.setTaskId(taskId);
+ memberTask.setDelFlag(0);
+ memberTask.setShopId(oldMemberTask.getShopId());
+ memberTask.setUserId(oldMemberTask.getUserId());
+ memberTask.setTaskDate(merFollowMemberTaskDto.getNextTaskDate());
+ memberTask.setTaskContent(merFollowMemberTaskDto.getNextTaskContent());
+ memberTask.setTaskStatus(2);
+ memberTask.setCreateTime(new Date());
+ this.saveOrUpdate(memberTask);
+ }
+ }
}
--
Gitblit v1.7.1