From add86a49cc69b6882500c95dd67a2ac826c35526 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 26 七月 2023 20:16:51 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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 f535117..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
@@ -159,9 +159,11 @@
for(StaffShopTaskPageVo staffShopTaskPageVo : shopTaskPageVoList){
//获取任务用户信息
userId = staffShopTaskPageVo.getUserId();
- sysUser = remoteUserService.getSysUser(userId).getData();
- staffShopTaskPageVo.setUserName(sysUser.getNickName());
- staffShopTaskPageVo.setUserPicture(sysUser.getAvatar());
+ if(userId!=null){
+ sysUser = remoteUserService.getSysUser(userId).getData();
+ staffShopTaskPageVo.setUserName(sysUser.getNickName());
+ staffShopTaskPageVo.setUserPicture(sysUser.getAvatar());
+ }
}
}
return shopTaskPageVoList;
@@ -229,6 +231,7 @@
shopTaskRecord.setCallPhone(staffFollowShopTaskDto.getCallPhone());
shopTaskRecord.setFollowContent(followPhoneDto.getFollowContent());
shopTaskRecord.setCallTime(followPhoneDto.getCallTime());
+ shopTaskRecord.setCreateTime(new Date());
// 保存或更新会员任务记录
shopTaskRecordService.saveOrUpdate(shopTaskRecord);
}
@@ -241,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);
@@ -299,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