From 43c263df4d8ce0cc830f287780c29db8a2b47f0f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 27 五月 2024 08:44:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java | 37 ++++---------------------------------
1 files changed, 4 insertions(+), 33 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java
index c48f9fb..f20b462 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.domain.pojo.AuctionBidRecord;
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
@@ -36,8 +37,7 @@
@Resource
private IAuctionBidRecordService iAuctionBidRecordService;
- @Resource
- private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;
+
/**
* 拍卖大屏滚动
*
@@ -45,37 +45,8 @@
@RequestMapping("/getAuctionBidRecordList")
@ResponseBody
@ApiOperation(value = "拍卖大屏滚动出价")
- public R<List<AuctionBidRecord>> getAuctionBidRecordList(@PathVariable("goodsSkuId") Integer goodsSkuId) {
-
- AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getById(goodsSkuId);
- List<AuctionBidRecord> auctionBidRecordList=new ArrayList<>();
- if (auctionSalesroomGoods.getStatus().getCode()==1){
- LambdaQueryWrapper<AuctionBidRecord> wrapper=Wrappers.lambdaQuery();
- wrapper.eq(AuctionBidRecord::getGoodsSkuId,goodsSkuId);
- wrapper.eq(AuctionBidRecord::getDelFlag,0);
- wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
- auctionBidRecordList=iAuctionBidRecordService.list(wrapper);
- //判断
- if (auctionBidRecordList.size()>=auctionSalesroomGoods.getItemQuantity()){
- for (int i=0;i<=auctionSalesroomGoods.getItemQuantity();i++){
- AuctionBidRecord auctionBidRecord= auctionBidRecordList.get(i);
- auctionBidRecord.setStatus(BidStatusEnum.LEAD);
- }
- }else{
- for (int i=0;i<=auctionBidRecordList.size();i++){
- AuctionBidRecord auctionBidRecord= auctionBidRecordList.get(i);
- auctionBidRecord.setStatus(BidStatusEnum.LEAD);
- }
- }
- }if (auctionSalesroomGoods.getStatus().getCode()==2){
- LambdaQueryWrapper<AuctionBidRecord> wrapper=Wrappers.lambdaQuery();
- wrapper.eq(AuctionBidRecord::getGoodsSkuId,goodsSkuId);
- wrapper.eq(AuctionBidRecord::getStatus,2);
- wrapper.eq(AuctionBidRecord::getDelFlag,0);
- wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
- auctionBidRecordList=iAuctionBidRecordService.list(wrapper);
- }
- return R.ok(auctionBidRecordList);
+ public R<List<AuctionBidRecord>> getAuctionBidRecordList(AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
+ return R.ok(iAuctionBidRecordService.getAuctionBidRecordList(auctionSalesroomGoodsDTO));
}
--
Gitblit v1.7.1