bug

jiangqs

2023-08-21 c93e76c57a98e35abbf62d2f514d9ba51efd3243

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java

@@ -39,10 +39,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -131,7 +128,7 @@
            activityTotal.setOrderMoneyTotal(BigDecimal.ZERO);
            activityTotalService.save(activityTotal);
            CodeGetDto codeGetDto = new CodeGetDto();
            String url = "https://wxapp.hhhrt.cn/mini/activity?activityId="+activityId;
            String url = "https://wxapp.hhhrt.cn/mini/activity?id="+activityId;
            codeGetDto.setUrl(url);
            codeGetDto.setFileName("activity-"+activityId);
            String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();
@@ -144,7 +141,8 @@
        if (nowTime.compareTo(activityStartTime) < 0) {
            activity.setActivityStatus(0);
        } else {
            throw new ServiceException(AppErrorConstant.ACTIVITY_TIME_ERROR);
            activity.setActivityStatus(1);

        }
        // 设置活动信息
        activity.setActivityName(mgtActivityEditDto.getActivityName());
@@ -162,6 +160,18 @@
        activity.setUpdateUserId(mgtActivityEditDto.getUserId());
        activity.setUpdateTime(nowTime);
        activity.setRecommendFlag(mgtActivityEditDto.getRecommendFlag());
        if(activity.getAreaFlag()==2&&activity.getShopFlag()==1&&StringUtils.isNotBlank(activity.getDesignatedArea())){
            activity.setApplicableShop("");
            String designatedArea = activity.getDesignatedArea();
            List<String> cityCodes = Arrays.asList(designatedArea.split(","));
            List<Long> shopIdList = remoteShopService.listShopIdByCityCode(cityCodes).getData();
            if(shopIdList!=null&&!shopIdList.isEmpty()){
                String result = shopIdList.stream()
                        .map(String::valueOf)
                        .collect(Collectors.joining(","));
                activity.setApplicableShop(result);
            }
        }
        this.saveOrUpdate(activity);
        // 获取活动商品信息
        List<MgtActivityGoodsEditDto> mgtActivityGoodsEditDtoList = mgtActivityEditDto.getMgtActivityGoodsEditDtoList();
@@ -195,21 +205,37 @@
            long currentTimeMillis = System.currentTimeMillis();
            long startTimeDifference = activityStartTime.getTime() - currentTimeMillis;
            long endTimeDifference = activityEndTime.getTime() - currentTimeMillis;
            // 查询延时任务
            DelayTask startDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
            // 如果延时任务为空，创建延时任务控制活动定时开始和结束
            if (startDelayTask == null) {
                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);
            //判断任务是否已经开始,已经开始则3秒后立即开始
            if(nowTime.compareTo(activityStartTime) > 0){
                // 查询延时任务
                DelayTask startDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
                // 如果延时任务为空，创建延时任务控制活动定时开始和结束
                if (startDelayTask == null) {
                    redisService.setCacheObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId, activityStartTime, 3L, TimeUnit.SECONDS);
                    startDelayTask = new DelayTask();
                    startDelayTask.setDelFlag(0);
                    startDelayTask.setCreateTime(new Date());
                    startDelayTask.setEndTime(DateUtils.addSeconds(new Date(),3));
                    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, 3L, TimeUnit.SECONDS);
                        startDelayTask = new DelayTask();
                        startDelayTask.setDelFlag(0);
                        startDelayTask.setCreateTime(new Date());
                        startDelayTask.setEndTime(DateUtils.addSeconds(new Date(),3));
                        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);
                // 查询延时任务
                DelayTask startDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
                // 如果延时任务为空，创建延时任务控制活动定时开始和结束
                if (startDelayTask == null) {
                    redisService.setCacheObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId, activityStartTime, startTimeDifference, TimeUnit.MILLISECONDS);
                    startDelayTask = new DelayTask();
                    startDelayTask.setDelFlag(0);
@@ -217,6 +243,18 @@
                    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);
                    }
                }
            }
            // 查询延时任务
@@ -481,7 +519,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);
@@ -550,7 +588,7 @@
     */
    @Override
    public void changeActivityTotal(ActivityTotalChangeDto activityTotalChangeDto){

        log.debug("活动统计变化---"+activityTotalChangeDto.toString());
        RLock lock = redissonClient.getLock("activity_clock_"+activityTotalChangeDto.getActivityId());
        try {
            lock.lock(30, TimeUnit.SECONDS);