From efe79e640c4598f52c2d1032fcead000edf8049e Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 28 六月 2023 10:29:53 +0800
Subject: [PATCH] 统计bug和验证优化

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 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 b5f0db6..fed1213 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
@@ -55,7 +55,7 @@
      */
     @Override
     public List<MerMemberTaskPageVo> pageMerMemberTask(Page page, MerMemberTaskPageDto merMemberTaskPageDto){
-        String today = DateUtils.parseDateToStr("YYYY-MM-DD",DateUtils.getNowDate());
+        String today = DateUtils.parseDateToStr("YYYY-MM-DD",new Date());
         List<MerMemberTaskPageVo> merMemberTaskPageVoList = memberTaskMapper.pageMerMemberTask(page, merMemberTaskPageDto);
         if(merMemberTaskPageVoList!=null&&!merMemberTaskPageVoList.isEmpty()){
             String taskDate;
@@ -86,7 +86,7 @@
         memberTask.setUserId(merCreateMemberTaskDto.getMemberUserId());
         memberTask.setTaskDate(merCreateMemberTaskDto.getTaskDate());
         memberTask.setTaskContent(merCreateMemberTaskDto.getTaskContent());
-        memberTask.setCreateTime(DateUtils.getNowDate());
+        memberTask.setCreateTime(new Date());
         this.saveOrUpdate(memberTask);
     }
 
@@ -105,7 +105,7 @@
         memberTaskRecord.setCallPhone(merFollowMemberTaskDto.getCallPhone());
         memberTaskRecord.setCallTime(merFollowMemberTaskDto.getCallTime());
         memberTaskRecord.setFollowContent(merFollowMemberTaskDto.getFollowContent());
-        memberTaskRecord.setCreateTime(DateUtils.getNowDate());
+        memberTaskRecord.setCreateTime(new Date());
         memberTaskRecordService.saveOrUpdate(memberTaskRecord);
         String picture = merFollowMemberTaskDto.getPicture();
         String video = merFollowMemberTaskDto.getVideo();
@@ -158,8 +158,21 @@
             memberTask.setTaskDate(merFollowMemberTaskDto.getNextTaskDate());
             memberTask.setTaskContent(merFollowMemberTaskDto.getNextTaskContent());
             memberTask.setTaskStatus(2);
-            memberTask.setCreateTime(DateUtils.getNowDate());
+            memberTask.setCreateTime(new Date());
             this.saveOrUpdate(memberTask);
         }
     }
+
+    /**
+     * @description 获取进行中任务数
+     * @author  jqs
+     * @date    2023/6/26 13:45
+     * @param shopId
+     * @return  Integer
+     */
+    @Override
+    public Integer getMemberIngTotal(Long shopId) {
+        return memberTaskMapper.getMemberIngTotal(shopId);
+    }
+
 }

--
Gitblit v1.7.1