Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionVideoServiceImpl.java

@@ -3,11 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionVideo;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.system.api.domain.dto.ForepartAuctionVideo;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.domain.AuctionVideo;
import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper;
import com.ruoyi.auction.mapper.AuctionVideoMapper;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.auction.service.IAuctionVideoService;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
@@ -32,7 +33,7 @@
    private PromotionClient promotionClient;

    @Resource
    private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;
    private AuctionSalesroomGoodsMapper auctionSalesroomGoodsMapper;

    /**
     * 暖场视频or封面海报
@@ -54,9 +55,9 @@
        wrapper.eq(AuctionSalesroomGoods::getStatus,1);
        wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,orepartAuctionVideo.getAuctionSalesroomId());
        wrapper.eq(AuctionSalesroomGoods::getDelFlag,0);
        AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper);
        AuctionSalesroomGoods auctionSalesroomGoods=auctionSalesroomGoodsMapper.selectOne(wrapper);
        if (auctionSalesroomGoods!=null){
            R.fail("当前有拍卖品正在拍卖中，请结束后再试！");
            throw new ServiceException("当前有拍卖品正在拍卖中，请结束后再试！");
        }

        LambdaQueryWrapper<AuctionVideo> wrapper1=Wrappers.lambdaQuery();