From f44e4d609e7efaed9eac545137970b1e334f8106 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 21 九月 2024 09:01:36 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBidRecordServiceImpl.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBidRecordServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBidRecordServiceImpl.java
index bb911df..02d0514 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBidRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBidRecordServiceImpl.java
@@ -3,14 +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.system.api.domain.dto.AuctionSalesroomDTO;
 import com.ruoyi.auction.domain.AuctionBidRecord;
-import com.ruoyi.auction.domain.AuctionSalesroomGoods;
 import com.ruoyi.auction.mapper.AuctionBidRecordMapper;
 import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper;
 import com.ruoyi.auction.service.IAuctionBidRecordService;
 import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
 import com.ruoyi.common.core.enums.BidStatusEnum;
+import com.ruoyi.system.api.domain.AuctionSalesroomGoods;
+import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Resource;
@@ -40,18 +40,22 @@
                 wrapper.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsDTO.getGoodsSkuId());
                 wrapper.eq(AuctionBidRecord::getDelFlag,0);
                 wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
+                wrapper.orderByAsc(AuctionBidRecord::getLastBidTime);
                 auctionBidRecordList = this.list(wrapper);
                 //判断
                 if (auctionBidRecordList.size()>=auctionSalesroomGoods.getSalesroomStock()){
-                    for (int i=0;i<=auctionSalesroomGoods.getSalesroomStock();i++){
+                    for (int i=0;i<auctionSalesroomGoods.getSalesroomStock();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 (auctionBidRecordList.size()>0){
+                        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();
@@ -59,7 +63,8 @@
                 wrapper.eq(AuctionBidRecord::getStatus,2);
                 wrapper.eq(AuctionBidRecord::getDelFlag,0);
                 wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
-            auctionBidRecordList = this.list(wrapper);
+            wrapper.orderByAsc(AuctionBidRecord::getLastBidTime);
+                auctionBidRecordList = this.list(wrapper);
             }
             return auctionBidRecordList;
 

--
Gitblit v1.7.1