From fab844ecb6ff7c55a625b54e5481e0a2ab13abff Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 01 六月 2023 18:11:52 +0800
Subject: [PATCH] 商户管理

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 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..f7fb90e 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
@@ -43,7 +47,7 @@
      */
     @Override
     public List<MerAgencyTaskPageVo> pageMerAgencyTask(Page page, MerAgencyTaskPageDto merAgencyTaskPageDto){
-        String nowDay = DateUtils.parseDateToStr("YYYY-MM-dd",new Date());
+        String nowDay = DateUtils.parseDateToStr("YYYY-MM-dd",DateUtils.getNowDate());
         merAgencyTaskPageDto.setNowDay(nowDay);
         List<MerAgencyTaskPageVo> merAgencyTaskPageVoList = agencyTaskMapper.pageMerAgencyTask(page, merAgencyTaskPageDto);
         return merAgencyTaskPageVoList;
@@ -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);
@@ -65,7 +69,7 @@
         agencyTask.setAgencyId(merCreateAgencyTaskDto.getAgencyId());
         agencyTask.setTaskDate(merCreateAgencyTaskDto.getTaskDate());
         agencyTask.setTaskContent(merCreateAgencyTaskDto.getTaskContent());
-        agencyTask.setCreateTime(new Date());
+        agencyTask.setCreateTime(DateUtils.getNowDate());
         this.saveOrUpdate(agencyTask);
     }
 
@@ -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(DateUtils.getNowDate());
         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());
@@ -132,7 +145,7 @@
             agencyTask.setTaskDate(merFollowAgencyTaskDto.getNextTaskDate());
             agencyTask.setTaskContent(merFollowAgencyTaskDto.getNextTaskContent());
             agencyTask.setTaskStatus(2);
-            agencyTask.setCreateTime(new Date());
+            agencyTask.setCreateTime(DateUtils.getNowDate());
             this.saveOrUpdate(agencyTask);
         }
 

--
Gitblit v1.7.1