From 882edc4b8ac7cb11ec9d536b5573df2c7ed512ef Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 20 七月 2023 20:22:12 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
index 7e77dca..997f468 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
@@ -231,6 +231,7 @@
                     shopTaskRecord.setCallPhone(staffFollowShopTaskDto.getCallPhone());
                     shopTaskRecord.setFollowContent(followPhoneDto.getFollowContent());
                     shopTaskRecord.setCallTime(followPhoneDto.getCallTime());
+                    shopTaskRecord.setCreateTime(new Date());
                     // 保存或更新会员任务记录
                     shopTaskRecordService.saveOrUpdate(shopTaskRecord);
                 }
@@ -243,6 +244,7 @@
             shopTaskRecord.setUserId(staffFollowShopTaskDto.getUserId());
             shopTaskRecord.setFollowType(staffFollowShopTaskDto.getFollowType());
             shopTaskRecord.setFollowContent(staffFollowShopTaskDto.getFollowContent());
+            shopTaskRecord.setCustomFollowType(staffFollowShopTaskDto.getCustomFollowType());
             shopTaskRecord.setCreateTime(new Date());
             // 保存或更新会员任务记录
             shopTaskRecordService.saveOrUpdate(shopTaskRecord);
@@ -301,9 +303,32 @@
             shopTask.setShopId(oldShopTask.getShopId());
             shopTask.setTaskDate(staffFollowShopTaskDto.getNextTaskDate());
             shopTask.setFollowContent(staffFollowShopTaskDto.getNextTaskContent());
-            shopTask.setTaskStatus(2);
+            String nowTimeStr = DateUtils.getDate();
+            int i = staffFollowShopTaskDto.getNextTaskDate().compareTo(nowTimeStr);
+            if(i>0){
+                shopTask.setTaskStatus(0);
+            }else if(i==0){
+                shopTask.setTaskStatus(1);
+            }else{
+                shopTask.setTaskStatus(3);
+            }
+            shopTask.setEmergencyState(staffFollowShopTaskDto.getEmergencyState());
             shopTask.setCreateTime(new Date());
             this.saveOrUpdate(shopTask);
         }
     }
+
+    /**
+     * @description  检查任务时间状态
+     * @author  jqs
+     * @date    2023/7/19 18:01
+     * @param
+     * @return  void
+     */
+    @Override
+    public void checkTaskDateStatus(){
+        shopTaskMapper.checkShopTaskStatus();
+        shopTaskMapper.checkAgencyTaskStatus();
+        shopTaskMapper.checkMemberTaskStatus();
+    }
 }

--
Gitblit v1.7.1