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/MemberTaskServiceImpl.java |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 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 f8f5bc9..b5f0db6 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
@@ -15,6 +15,7 @@
 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;
 
@@ -41,6 +42,11 @@
 
     @Resource
     private RemoteMemberService remoteMemberService;
+
+    @Resource
+    private TaskFileService taskFileService;
+
+
     /**
      *
      * @param page
@@ -49,7 +55,7 @@
      */
     @Override
     public List<MerMemberTaskPageVo> pageMerMemberTask(Page page, MerMemberTaskPageDto merMemberTaskPageDto){
-        String today = DateUtils.parseDateToStr("YYYY-MM-DD",new Date());
+        String today = DateUtils.parseDateToStr("YYYY-MM-DD",DateUtils.getNowDate());
         List<MerMemberTaskPageVo> merMemberTaskPageVoList = memberTaskMapper.pageMerMemberTask(page, merMemberTaskPageDto);
         if(merMemberTaskPageVoList!=null&&!merMemberTaskPageVoList.isEmpty()){
             String taskDate;
@@ -72,7 +78,7 @@
     @Override
     public void createMemberTask(MerCreateMemberTaskDto merCreateMemberTaskDto){
         MemberTask memberTask = new MemberTask();
-        String taskId = IdUtils.fastUUID();
+        String taskId = IdUtils.simpleUUID();
         memberTask.setTaskId(taskId);
         memberTask.setDelFlag(0);
         memberTask.setTaskStatus(0);
@@ -80,7 +86,7 @@
         memberTask.setUserId(merCreateMemberTaskDto.getMemberUserId());
         memberTask.setTaskDate(merCreateMemberTaskDto.getTaskDate());
         memberTask.setTaskContent(merCreateMemberTaskDto.getTaskContent());
-        memberTask.setCreateTime(new Date());
+        memberTask.setCreateTime(DateUtils.getNowDate());
         this.saveOrUpdate(memberTask);
     }
 
@@ -98,6 +104,8 @@
         memberTaskRecord.setFollowType(merFollowMemberTaskDto.getFollowType());
         memberTaskRecord.setCallPhone(merFollowMemberTaskDto.getCallPhone());
         memberTaskRecord.setCallTime(merFollowMemberTaskDto.getCallTime());
+        memberTaskRecord.setFollowContent(merFollowMemberTaskDto.getFollowContent());
+        memberTaskRecord.setCreateTime(DateUtils.getNowDate());
         memberTaskRecordService.saveOrUpdate(memberTaskRecord);
         String picture = merFollowMemberTaskDto.getPicture();
         String video = merFollowMemberTaskDto.getVideo();
@@ -113,6 +121,7 @@
                 taskFile.setFollowFrom(2);
                 taskFile.setFileUrl(str);
                 taskFile.setFileType(1);
+                taskFileService.saveOrUpdate(taskFile);
             }
         }
         if(StringUtils.isNotBlank(video)){
@@ -124,6 +133,7 @@
                 taskFile.setFollowFrom(2);
                 taskFile.setFileUrl(str);
                 taskFile.setFileType(2);
+                taskFileService.saveOrUpdate(taskFile);
             }
         }
         if(StringUtils.isNotBlank(audio)){
@@ -135,11 +145,12 @@
                 taskFile.setFollowFrom(2);
                 taskFile.setFileUrl(str);
                 taskFile.setFileType(3);
+                taskFileService.saveOrUpdate(taskFile);
             }
         }
         if(StringUtils.isNotBlank(merFollowMemberTaskDto.getNextTaskDate())){
             MemberTask memberTask = new MemberTask();
-            String taskId = IdUtils.fastUUID();
+            String taskId = IdUtils.simpleUUID();
             memberTask.setTaskId(taskId);
             memberTask.setDelFlag(0);
             memberTask.setShopId(oldMemberTask.getShopId());
@@ -147,7 +158,7 @@
             memberTask.setTaskDate(merFollowMemberTaskDto.getNextTaskDate());
             memberTask.setTaskContent(merFollowMemberTaskDto.getNextTaskContent());
             memberTask.setTaskStatus(2);
-            memberTask.setCreateTime(new Date());
+            memberTask.setCreateTime(DateUtils.getNowDate());
             this.saveOrUpdate(memberTask);
         }
     }

--
Gitblit v1.7.1