From 95be57d7842d54c7043a5cdc448b1938e5ece058 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 29 七月 2023 19:09:54 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 aaaeccb..50a5f25 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
@@ -169,7 +169,7 @@
}
// 判断视频是否为空，并处理
if (StringUtils.isNotBlank(video)) {
- strArr = picture.split(",");
+ strArr = video.split(",");
for (String str : strArr) {
taskFile = new TaskFile();
taskFile.setDelFlag(0);
@@ -182,7 +182,7 @@
}
// 判断音频是否为空，并处理
if (StringUtils.isNotBlank(audio)) {
- strArr = picture.split(",");
+ strArr = audio.split(",");
for (String str : strArr) {
taskFile = new TaskFile();
taskFile.setDelFlag(0);
@@ -196,6 +196,7 @@
}
// 判断下一个任务日期是否为空，并处理
if (StringUtils.isNotBlank(merFollowMemberTaskDto.getNextTaskDate())) {
+ String nowTimeStr = DateUtils.getDate();
MemberTask memberTask = new MemberTask();
String taskId = IdUtils.simpleUUID();
memberTask.setTaskId(taskId);
@@ -204,7 +205,14 @@
memberTask.setUserId(oldMemberTask.getUserId());
memberTask.setTaskDate(merFollowMemberTaskDto.getNextTaskDate());
memberTask.setTaskContent(merFollowMemberTaskDto.getNextTaskContent());
- memberTask.setTaskStatus(2);
+ int i = merFollowMemberTaskDto.getNextTaskDate().compareTo(nowTimeStr);
+ if(i>0){
+ memberTask.setTaskStatus(0);
+ }else if(i==0){
+ memberTask.setTaskStatus(1);
+ }else{
+ memberTask.setTaskStatus(3);
+ }
memberTask.setCreateTime(new Date());
this.saveOrUpdate(memberTask);
}
--
Gitblit v1.7.1