Merge branch 'dev-mitao'

mitao

2024-05-27 95163bc7f6714edcb14dd4369717b0a9d1ae15da

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

@@ -9,6 +9,7 @@
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;
import com.ruoyi.system.api.domain.PromotionVideo;
import com.ruoyi.system.api.feignClient.PromotionClient;
@@ -42,7 +43,8 @@
     */
    @Override
    public List<PromotionVideo> getVoidList() {
        R<List<PromotionVideo>> promotionVideoList=promotionClient.getPromotionVideoList();
        R<List<PromotionVideo>> promotionVideoList = promotionClient.getPromotionVideoList(
                SecurityConstants.INNER);
        List<PromotionVideo> promotionVideos=promotionVideoList.getData();
        return promotionVideos;
    }
@@ -69,7 +71,9 @@
            iAuctionVideoService.removeById(auctionVideo);
        }

        R<PromotionVideo> promotionVideo=promotionClient.getPromotionVideoOne(orepartAuctionVideo.getPromotionVideoId());
        R<PromotionVideo> promotionVideo = promotionClient.getPromotionVideoOne(
                orepartAuctionVideo.getPromotionVideoId(),
                SecurityConstants.INNER);
        PromotionVideo promotionVideo1= promotionVideo.getData();

        AuctionVideo auctionVideo1=new AuctionVideo();