Merge branch 'mitao-dev'

mitao

2024-05-31 fc13d832e58e42e241aa827e930651a28ca357e1

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

@@ -32,9 +32,6 @@
    private PromotionClient promotionClient;

    @Resource
    private IAuctionVideoService  iAuctionVideoService;

    @Resource
    private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;

    /**
@@ -66,9 +63,9 @@
        wrapper1.eq(AuctionVideo::getAuctionSalesroomId,orepartAuctionVideo.getAuctionSalesroomId());
        wrapper1.eq(AuctionVideo::getPromotionVideoId,orepartAuctionVideo.getPromotionVideoId());
        wrapper1.eq(AuctionVideo::getDelFlag,0);
        AuctionVideo auctionVideo=iAuctionVideoService.getOne(wrapper1);
        AuctionVideo auctionVideo = this.getOne(wrapper1);
        if (auctionVideo!=null){
            iAuctionVideoService.removeById(auctionVideo);
            this.removeById(auctionVideo);
        }

        R<PromotionVideo> promotionVideo = promotionClient.getPromotionVideoOne(
@@ -80,6 +77,6 @@
        auctionVideo1.setPromotionVideoId(orepartAuctionVideo.getPromotionVideoId());
        auctionVideo1.setAuctionSalesroomId(orepartAuctionVideo.getAuctionSalesroomId());
        auctionVideo1.setPromotionVideoUrl(promotionVideo1.getVideoUrl());
        iAuctionVideoService.save(auctionVideo1);
        this.save(auctionVideo1);
    }
}