From 257ce232897d0e4a232e827ba61516b747389078 Mon Sep 17 00:00:00 2001
From: zhanglin <852614290@qq.com>
Date: 星期日, 23 七月 2023 16:04:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
index 584441d..eb3e653 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
@@ -9,10 +9,7 @@
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.goods.domain.dto.MgtActivityEditDto;
-import com.ruoyi.goods.domain.dto.MgtActivityGoodsEditDto;
-import com.ruoyi.goods.domain.dto.MgtActivityPageDto;
-import com.ruoyi.goods.domain.dto.MgtActivityRecordPageDto;
+import com.ruoyi.goods.domain.dto.*;
import com.ruoyi.goods.domain.pojo.activity.Activity;
import com.ruoyi.goods.domain.pojo.activity.ActivityTotal;
import com.ruoyi.goods.domain.vo.*;
@@ -182,8 +179,8 @@
if(checkTime.compareTo(activityStartTime)>0){
String activityId = activity.getActivityId();
long currentTimeMillis = System.currentTimeMillis();
- long startTimeDifference = currentTimeMillis - activityStartTime.getTime();
- long endTimeDifference = currentTimeMillis - activityEndTime.getTime();
+ long startTimeDifference = activityStartTime.getTime() - currentTimeMillis;
+ long endTimeDifference = activityEndTime.getTime() - currentTimeMillis;
// 查询延时任务
DelayTask startDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
// 如果延时任务为空，创建延时任务控制活动定时开始和结束
@@ -197,7 +194,7 @@
remoteConfigService.addDelayTask(startDelayTask);
}
// 查询延时任务
- DelayTask endDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
+ DelayTask endDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId).getData();
// 如果延时任务为空，创建延时任务控制活动定时开始和结束
if (endDelayTask == null) {
redisService.setCacheObject(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId, activityEndTime, endTimeDifference, TimeUnit.MILLISECONDS);
@@ -430,8 +427,8 @@
Date activityStartTime = activity.getActivityStartTime();
Date activityEndTime = activity.getActivityEndTime();
long currentTimeMillis = System.currentTimeMillis();
- long startTimeDifference = currentTimeMillis - activityStartTime.getTime();
- long endTimeDifference = currentTimeMillis - activityEndTime.getTime();
+ long startTimeDifference = activityStartTime.getTime() - currentTimeMillis;
+ long endTimeDifference = activityEndTime.getTime() - currentTimeMillis;
// 查询延时任务
DelayTask startDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
// 如果延时任务为空，创建延时任务控制活动定时开始和结束
@@ -562,4 +559,16 @@
lock.unlock();
}
}
+
+ /**
+ * @description 获取活动列表
+ * @author jqs
+ * @date 2023/7/17 14:46
+ * @param staffActivityListDto
+ * @return List<MgtActivityListVo>
+ */
+ @Override
+ public List<MgtActivityListVo> listStaffActivity(StaffActivityListDto staffActivityListDto){
+ return activityMapper.listStaffActivity(staffActivityListDto);
+ }
}
--
Gitblit v1.7.1