Merge pull request #153 from phuuthanh-dev/develop

a
phuuthanh-dev · Jul 21, 2024 · 2d4f9d6 · 2d4f9d6
2 parents 5d382bd + f6d532c
commit 2d4f9d6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/vn/webapp/backend/auction/service/bid/AuctionHistoryServiceImpl.java b/src/main/java/vn/webapp/backend/auction/service/bid/AuctionHistoryServiceImpl.java
@@ -129,7 +129,7 @@ public void deleteBidByUserAndAuction(Integer userId, Integer auctionId, String
         List<AuctionHistory> lastActiveBids = auctionHistoryRepository.findLastActiveBidByAuctionId(auctionId);
         if (!lastActiveBids.isEmpty()) {
             AuctionHistory lastActiveBid = lastActiveBids.get(0);
-            if (lastActiveBid.getPriceGiven() < auction.getJewelry().getBuyNowPrice()) {
+            if (lastActiveBid.getPriceGiven() < auction.getJewelry().getBuyNowPrice() && auction.getEndDateStored() != null) {
                 auction.setEndDate(auction.getEndDateStored());
             }
             auction.setLastPrice(lastActiveBid.getPriceGiven());