Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1

luofl

2025-03-11 8f2f35da0cbb07d8bf0d04468c8a2bdf5ee895e5

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

@@ -40,6 +40,7 @@
                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()){
@@ -62,6 +63,7 @@
                wrapper.eq(AuctionBidRecord::getStatus,2);
                wrapper.eq(AuctionBidRecord::getDelFlag,0);
                wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
            wrapper.orderByAsc(AuctionBidRecord::getLastBidTime);
                auctionBidRecordList = this.list(wrapper);
            }
            return auctionBidRecordList;