From b95715d5cdc806cbb15cc7f49c538e61f5ab5dc6 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:31:46 +0800
Subject: [PATCH] bug和二维码
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 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..f949202 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);
@@ -267,7 +269,7 @@
}
// 判断视频是否为空，并处理
if (StringUtils.isNotBlank(video)) {
- strArr = picture.split(",");
+ strArr = video.split(",");
for (String str : strArr) {
taskFile = new TaskFile();
taskFile.setDelFlag(0);
@@ -280,7 +282,7 @@
}
// 判断音频是否为空，并处理
if (StringUtils.isNotBlank(audio)) {
- strArr = picture.split(",");
+ strArr = audio.split(",");
for (String str : strArr) {
taskFile = new TaskFile();
taskFile.setDelFlag(0);
@@ -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