From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionVideoServiceImpl.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionVideoServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionVideoServiceImpl.java
index d5d6e4b..c795328 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionVideoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionVideoServiceImpl.java
@@ -3,12 +3,14 @@
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;
import com.ruoyi.system.api.domain.PromotionVideo;
import com.ruoyi.system.api.feignClient.PromotionClient;
@@ -31,10 +33,7 @@
private PromotionClient promotionClient;
@Resource
- private IAuctionVideoService iAuctionVideoService;
-
- @Resource
- private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;
+ private AuctionSalesroomGoodsMapper auctionSalesroomGoodsMapper;
/**
* 暖场视频or封面海报
@@ -42,7 +41,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;
}
@@ -55,27 +55,29 @@
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();
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(orepartAuctionVideo.getPromotionVideoId());
+ R<PromotionVideo> promotionVideo = promotionClient.getPromotionVideoOne(
+ orepartAuctionVideo.getPromotionVideoId(),
+ SecurityConstants.INNER);
PromotionVideo promotionVideo1= promotionVideo.getData();
AuctionVideo auctionVideo1=new AuctionVideo();
auctionVideo1.setPromotionVideoId(orepartAuctionVideo.getPromotionVideoId());
auctionVideo1.setAuctionSalesroomId(orepartAuctionVideo.getAuctionSalesroomId());
auctionVideo1.setPromotionVideoUrl(promotionVideo1.getVideoUrl());
- iAuctionVideoService.save(auctionVideo1);
+ this.save(auctionVideo1);
}
}
--
Gitblit v1.7.1