From 1f9b64476716a6a1de3bcb886bf4e64b123f7523 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 06 七月 2023 18:28:31 +0800
Subject: [PATCH] 管理台bug和用户端活动商品购买
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java | 27 +++++++++++++++++++++++----
1 files changed, 23 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 3bf2a48..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
@@ -1,5 +1,6 @@
package com.ruoyi.shop.service.impl.task;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
@@ -12,6 +13,7 @@
import com.ruoyi.shop.service.task.ShopTaskRecordService;
import com.ruoyi.shop.service.task.ShopTaskService;
import com.ruoyi.shop.service.task.TaskFileService;
+import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -30,8 +32,6 @@
@Service
public class ShopTaskServiceImpl extends ServiceImpl<ShopTaskMapper, ShopTask> implements ShopTaskService {
- @Resource
- private ShopTaskMapper shopTaskMapper;
@Resource
private ShopTaskRecordService shopTaskRecordService;
@@ -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"));
@@ -104,5 +106,22 @@
this.saveOrUpdate(shopNextTask);
}
-
+ /**
+ * @description boardTaskTotal
+ * @param
+ * @return MgtBulletinBoardVo
+ * @author jqs34
+ * @date 2023/6/18 17:08
+ */
+ @Override
+ public MgtBulletinBoardVo boardTaskTotal(){
+ MgtBulletinBoardVo mgtBulletinBoardVo = new MgtBulletinBoardVo();
+ LambdaQueryWrapper<ShopTask> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ShopTask::getDelFlag,0);
+ queryWrapper.eq(ShopTask::getTaskStatus,1);
+ queryWrapper.eq(ShopTask::getTaskDate,DateUtils.getDate());
+ Integer followShopToday = this.count(queryWrapper);
+ mgtBulletinBoardVo.setFollowShopToday(followShopToday);
+ return mgtBulletinBoardVo;
+ }
}
--
Gitblit v1.7.1