From 5627daeb1ac1a29947e902f9a7efb6730ed98611 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 07 七月 2023 20:35:50 +0800
Subject: [PATCH] 管理台bug和用户端生日卡
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 fc6e744..102f604 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
@@ -55,10 +55,11 @@
shopTask.setShopId(mgtFollowShopTaskDto.getShopId());
shopTask.setFollowType(mgtFollowShopTaskDto.getFollowType());
shopTask.setNextFollowDate(DateUtils.toDate(LocalDate.now()));
- shopTask.setTaskTitle(mgtFollowShopTaskDto.getNextTaskTitle());
+ shopTask.setTaskTitle(mgtFollowShopTaskDto.getTaskTitle());
shopTask.setEmergencyState(mgtFollowShopTaskDto.getEmergencyState());
shopTask.setCreateTime(new Date());
shopTask.setTaskDate(DateUtils.toDate(LocalDate.now()));
+ shopTask.setTaskStatus(2);
this.saveOrUpdate(shopTask);
//创建任务记录
ShopTaskRecord shopTaskRecord = new ShopTaskRecord();
@@ -95,6 +96,7 @@
shopNextTask.setTaskTitle(mgtFollowShopTaskDto.getNextTaskTitle());
shopNextTask.setEmergencyState(mgtFollowShopTaskDto.getEmergencyState());
shopNextTask.setCreateTime(new Date());
+ shopNextTask.setTaskStatus(0);
try {
shopNextTask.setNextFollowDate(DateUtils.parseDate(mgtFollowShopTaskDto.getNextTaskDate(),"yyyy-MM-dd"));
shopNextTask.setTaskDate(DateUtils.parseDate(mgtFollowShopTaskDto.getNextTaskDate(),"yyyy-MM-dd"));
@@ -114,7 +116,7 @@
@Override
public MgtBulletinBoardVo boardTaskTotal(){
MgtBulletinBoardVo mgtBulletinBoardVo = new MgtBulletinBoardVo();
- LambdaQueryWrapper<ShopTask> queryWrapper = new LambdaQueryWrapper();
+ LambdaQueryWrapper<ShopTask> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ShopTask::getDelFlag,0);
queryWrapper.eq(ShopTask::getTaskStatus,1);
queryWrapper.eq(ShopTask::getTaskDate,DateUtils.getDate());
--
Gitblit v1.7.1