Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

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

@@ -1,24 +1,24 @@
package com.ruoyi.goods.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.goods.domain.GoodsSeckillAppointment;
import com.ruoyi.goods.mapper.GoodsSeckillAppointmentMapper;
import com.ruoyi.goods.mapper.GoodsSeckillMapper;
import com.ruoyi.goods.service.IGoodsSeckillAppointmentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.goods.service.IGoodsSeckillService;
import com.ruoyi.system.api.constants.DelayTaskEnum;
import com.ruoyi.system.api.domain.DelayTask;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;

/**
 * <p>
@@ -31,7 +31,7 @@
@Service
public class GoodsSeckillAppointmentServiceImpl extends ServiceImpl<GoodsSeckillAppointmentMapper, GoodsSeckillAppointment> implements IGoodsSeckillAppointmentService {
   @Resource
    private  IGoodsSeckillService goodsSeckillService;
   private GoodsSeckillMapper goodsSeckillMapper;

    @Resource
    private SysUserClient sysUserClient;
@@ -39,13 +39,9 @@
   private RedisService redisService;
    @Override
    public R goodsSeckillAppointment(HomeGoodsSkuDTO homeGoodsSkuDTO) {
        GoodsSeckillAppointment goodsSeckillAppointment=new GoodsSeckillAppointment();
        goodsSeckillAppointment.setGoodsSeckillId(homeGoodsSkuDTO.getGoodsSkuId());
        goodsSeckillAppointment.setMemberId(homeGoodsSkuDTO.getMemberId());
        goodsSeckillAppointment.setFormId(homeGoodsSkuDTO.getFormId());
        this.save(goodsSeckillAppointment);

        GoodsSeckill byId = goodsSeckillService.getById(homeGoodsSkuDTO.getGoodsSkuId());

        GoodsSeckill byId = goodsSeckillMapper.selectById(homeGoodsSkuDTO.getGoodsSkuId());

        DelayTask delayTask = new DelayTask();
        delayTask.setDelFlag(0);
@@ -55,10 +51,19 @@
        sysUserClient.addDelayTask(delayTask, SecurityConstants.INNER);

        Duration duration = Duration.between(LocalDateTime.now(), byId.getStartTime().minusMinutes(30));
        try {
            redisService.setCacheObject(
                    DelayTaskEnum.AUTOMATIC_CANCEL.getCode() + "-" + byId.getId(),
                    byId.getStartTime().minusMinutes(30), duration.getSeconds(), TimeUnit.SECONDS);
        }catch (Exception e){

        redisService.setCacheObject(
                DelayTaskEnum.AUTOMATIC_CANCEL.getCode() + "-" + byId.getId(),
                byId.getStartTime().minusMinutes(30), duration.getSeconds(), TimeUnit.SECONDS);
        }

        GoodsSeckillAppointment goodsSeckillAppointment=new GoodsSeckillAppointment();
        goodsSeckillAppointment.setGoodsSeckillId(homeGoodsSkuDTO.getGoodsSkuId());
        goodsSeckillAppointment.setMemberId(homeGoodsSkuDTO.getMemberId());
        goodsSeckillAppointment.setFormId(homeGoodsSkuDTO.getFormId());
        this.save(goodsSeckillAppointment);

        return R.ok();
    }