From 122bb1142631e31ce50716495dba420102f58f56 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 31 七月 2023 20:05:05 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java |   61 ++++++++++++++++++++++++++----
 1 files changed, 52 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..ec44e37 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.*;
@@ -83,6 +80,7 @@
 
     @Resource
     private RedisService redisService;
+
 
     @Autowired
     private RedissonClient redissonClient;
@@ -182,8 +180,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();
             // 如果延时任务为空,创建延时任务控制活动定时开始和结束
@@ -195,9 +193,21 @@
                 startDelayTask.setEndTime(activityStartTime);
                 startDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
                 remoteConfigService.addDelayTask(startDelayTask);
+            }else{
+                if(startDelayTask.getEndTime().compareTo(activityStartTime)!=0){
+                    remoteConfigService.deleteDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+                    redisService.deleteObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+                    redisService.setCacheObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId, activityStartTime, startTimeDifference, TimeUnit.MILLISECONDS);
+                    startDelayTask = new DelayTask();
+                    startDelayTask.setDelFlag(0);
+                    startDelayTask.setCreateTime(new Date());
+                    startDelayTask.setEndTime(activityStartTime);
+                    startDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+                    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);
@@ -207,6 +217,18 @@
                 endDelayTask.setEndTime(activityEndTime);
                 endDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId);
                 remoteConfigService.addDelayTask(endDelayTask);
+            }else{
+                if(endDelayTask.getEndTime().compareTo(activityEndTime)!=0){
+                    remoteConfigService.deleteDelayTask(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId);
+                    redisService.deleteObject(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId);
+                    redisService.setCacheObject(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId, activityEndTime, startTimeDifference, TimeUnit.MILLISECONDS);
+                    endDelayTask = new DelayTask();
+                    endDelayTask.setDelFlag(0);
+                    endDelayTask.setCreateTime(new Date());
+                    endDelayTask.setEndTime(activityStartTime);
+                    endDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId);
+                    remoteConfigService.addDelayTask(endDelayTask);
+                }
             }
         }
     }
@@ -387,6 +409,7 @@
         String goodsId = activityGoodsGetDto.getGoodsId();
         Activity activity = this.getById(activityId);
         ActivityGoods activityGoods = activityGoodsService.getByGoodsId(activityId,goodsId);
+        activityGoodsGetVo.setActivityName(activity.getActivityName());
         activityGoodsGetVo.setActivityPrice(activityGoods.getActivityPrice());
         activityGoodsGetVo.setActivitySubscription(activityGoods.getActivitySubscription());
         activityGoodsGetVo.setActivityStatus(activity.getActivityStatus());
@@ -430,8 +453,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();
                 // 如果延时任务为空,创建延时任务控制活动定时开始和结束
@@ -469,6 +492,7 @@
      */
     @Override
     public void startActivity(String activityId){
+        log.debug(activityId+"活动开始");
         Activity activity = this.getById(activityId);
         if(activity!=null&&activity.getActivityStatus()==0){
             activity.setActivityStatus(1);
@@ -562,4 +586,23 @@
             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);
+    }
+
+    private void createActivityCode(String activityId){
+
+
+
+
+    }
 }

--
Gitblit v1.7.1