From 885a5836eb0fc1d7fcf54fbdb5f1969b9238a18c Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 30 五月 2024 09:13:12 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java | 53 ++++-------------------------------------------------
1 files changed, 4 insertions(+), 49 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java
index 95a9e8c..591d3b9 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java
@@ -1,20 +1,10 @@
package com.ruoyi.auction.controller.forepart;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.auction.controller.forepart.DTO.ForepartAuctionBidRecordDTO;
-import com.ruoyi.auction.controller.forepart.DTO.ForepartAuctionVideo;
-import com.ruoyi.auction.controller.forepart.VO.ForepartAuctionSalesroomVO;
-import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
-import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
-import com.ruoyi.auction.domain.pojo.AuctionVideo;
-import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
+import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionVideo;
import com.ruoyi.auction.service.IAuctionVideoService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.PromotionVideo;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.feignClient.PromotionClient;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;
@@ -37,13 +27,7 @@
@Resource
- private PromotionClient promotionClient;
-
- @Resource
private IAuctionVideoService iAuctionVideoService;
-
- @Resource
- private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;
/**
@@ -54,9 +38,7 @@
@ResponseBody
@ApiOperation(value = "获取拍卖师端视频列表")
public R<List<PromotionVideo>> getVoidList() {
- R<List<PromotionVideo>> promotionVideoList=promotionClient.getPromotionVideoList();
- List<PromotionVideo> promotionVideos=promotionVideoList.getData();
- return R.ok(promotionVideos);
+ return R.ok(iAuctionVideoService.getVoidList());
}
@@ -64,35 +46,8 @@
@RequestMapping("/addVoid")
@ResponseBody
@ApiOperation(value = "拍卖师端添加拍卖会视频播放")
- public R<T> addVoid(@RequestBody ForepartAuctionVideo orepartAuctionVideo) {
-
-
- LambdaQueryWrapper<AuctionSalesroomGoods> wrapper=Wrappers.lambdaQuery();
- wrapper.eq(AuctionSalesroomGoods::getStatus,1);
- wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,orepartAuctionVideo.getAuctionSalesroomId());
- wrapper.eq(AuctionSalesroomGoods::getDelFlag,0);
- AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper);
- if (auctionSalesroomGoods!=null){
- R.fail("当前有拍卖品正在拍卖中，请结束后再试！");
- }
-
- 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);
- if (auctionVideo!=null){
- iAuctionVideoService.removeById(auctionVideo);
- }
-
- R<PromotionVideo> promotionVideo=promotionClient.getPromotionVideoOne(orepartAuctionVideo.getPromotionVideoId());
- PromotionVideo promotionVideo1= promotionVideo.getData();
-
- AuctionVideo auctionVideo1=new AuctionVideo();
- auctionVideo1.setPromotionVideoId(orepartAuctionVideo.getPromotionVideoId());
- auctionVideo1.setAuctionSalesroomId(orepartAuctionVideo.getAuctionSalesroomId());
- auctionVideo1.setPromotionVideoUrl(promotionVideo1.getVideoUrl());
- iAuctionVideoService.save(auctionVideo1);
+ public R addVoid(@RequestBody ForepartAuctionVideo orepartAuctionVideo) {
+ iAuctionVideoService.addVoid(orepartAuctionVideo);
return R.ok();
}
--
Gitblit v1.7.1