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/AuctionSalesroomServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index 4f263b1..e6ff93b 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -1458,7 +1458,7 @@
Wrappers.lambdaQuery(AuctionBidRecord.class)
.eq(AuctionBidRecord::getAuctionSalesroomId,
auctionSalesroomGoods.getAuctionSalesroomId())
- .eq(AuctionBidRecord::getTargetId, auctionSalesroomGoods.getGoodsSkuId())
+ .eq(AuctionBidRecord::getTargetId, auctionSalesroomGoods.getId())
.eq(AuctionBidRecord::getAuctionType, AuctionOrderTypeEnum.AUCTION_ITEMS)
.orderByDesc(AuctionBidRecord::getLastBidAmount));
if (CollUtils.isNotEmpty(auctionBidRecordList)) {
@@ -1471,7 +1471,7 @@
auctionBidRecords.add(auctionBidRecord);
}
} else {
- for (int i = 0; i < auctionSalesroomGoods.getSalesroomStock(); i++) {
+ for (int i = 0; i < auctionBidRecordList.size(); i++) {
AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
auctionBidRecordMapper.updateById(auctionBidRecord);
--
Gitblit v1.7.1