bug

jiangqs

2023-08-08 2d20929b57b4562959f355d20a09a474d46939dd

 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.*;
@@ -32,6 +29,7 @@
import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
import com.ruoyi.system.api.domain.vo.MgtUserIdByKeywordVo;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteFileService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteShopService;
import org.redisson.api.RLock;
@@ -84,8 +82,12 @@
    @Resource
    private RedisService redisService;


    @Autowired
    private RedissonClient redissonClient;

    @Resource
    private RemoteFileService remoteFileService;

    /**
     * @param mgtActivityEditDto
@@ -99,6 +101,9 @@
        Activity activity;
        // 获取当前时间
        Date nowTime = new Date();
        if(mgtActivityEditDto.getActivityStartTime().compareTo(mgtActivityEditDto.getActivityEndTime())>0){
            throw new ServiceException(AppErrorConstant.ACTIVITY_SE_ERROR);
        }
        // 如果活动ID不为空，则表示修改活动信息
        if (StringUtils.isNotBlank(mgtActivityEditDto.getActivityId())) {
            // 获取活动信息
@@ -125,6 +130,12 @@
            activityTotal.setRefundTotal(0);
            activityTotal.setOrderMoneyTotal(BigDecimal.ZERO);
            activityTotalService.save(activityTotal);
            CodeGetDto codeGetDto = new CodeGetDto();
            String url = "https://wxapp.hhhrt.cn/mini/activity?activityId="+activityId;
            codeGetDto.setUrl(url);
            codeGetDto.setFileName("activity-"+activityId);
            String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();
            activity.setActivityCode(codeUrl);
        }
        // 获取活动开始时间和结束时间
        Date activityStartTime = mgtActivityEditDto.getActivityStartTime();
@@ -182,8 +193,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 +206,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 +230,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 +422,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 +466,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 +505,7 @@
     */
    @Override
    public void startActivity(String activityId){
        log.debug(activityId+"活动开始");
        Activity activity = this.getById(activityId);
        if(activity!=null&&activity.getActivityStatus()==0){
            activity.setActivityStatus(1);
@@ -513,7 +550,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);
@@ -553,13 +590,33 @@
        try {
            lock.lock(30, TimeUnit.SECONDS);
            if(agStockChangeDto.getChangeType()==1){
                //减少销量增加库存
                activityMapper.addActivityGoodsStock(agStockChangeDto);
            }else{
                //更新库存
                //增加销量减少库存
                activityMapper.subActivityGoodsStock(agStockChangeDto);
            }
        } finally {
            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){




    }
}