From 1044d3cdd5acdfec56120dc176a52fcec26c4f57 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 17 七月 2024 19:13:00 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 bf73784..63bc930 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
@@ -623,11 +623,6 @@
if (byId.getStartingPrice().doubleValue()>bidVO.getLastBidAmount().doubleValue()){
throw new ServiceException("出价不能比起拍价低");
}
- BigDecimal bigDecimal=byId.getStartingPrice().add(byId.getMinimumMarkupAmount());
- if (bigDecimal.doubleValue()>bidVO.getLastBidAmount().doubleValue()){
- throw new ServiceException("出价不能比每次最少加价低");
- }
-
LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery();
wrapper3.eq(AuctionBidRecord::getAuctionSalesroomId,bidVO.getAuctionSalesroomId());
@@ -641,6 +636,14 @@
throw new ServiceException("出价不能比当前最高价低");
}
}
+
+ BigDecimal bigDecimal=byId.getStartingPrice().add(byId.getMinimumMarkupAmount());
+ if (bigDecimal.doubleValue()>bidVO.getLastBidAmount().doubleValue()){
+ throw new ServiceException("出价不能比每次最少加价低");
+ }
+
+
+
LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
@@ -665,7 +668,7 @@
one.setTargetId(bidVO.getTargetId());
one.setMemberId(bidVO.getMemberId());
one.setLastBidTime(LocalDateTime.now());
- if(membeOne.getRealName()!=null||membeOne.getRealName()!=""){
+ if(membeOne.getRealName()!=null&&membeOne.getRealName()!=""){
one.setNickname(membeOne.getRealName());
}else{
one.setNickname(membeOne.getNickname());
@@ -1492,8 +1495,8 @@
Wrappers.<AuctionBidRecord>lambdaQuery()
.eq(AuctionBidRecord::getAuctionSalesroomId, auctionSalesroomId)
.eq(AuctionBidRecord::getStatus, BidStatusEnum.ELIMINATE));
- List<Long> memberIdlist = auctionBidRecordList.stream().map(AuctionBidRecord::getMemberId)
- .collect(Collectors.toList());
+ Set<Long> memberIdlist = auctionBidRecordList.stream().map(AuctionBidRecord::getMemberId)
+ .collect(Collectors.toSet());
if (StringUtils.isNotEmpty(memberIdlist)) {
OrderAuctionBondDTO orderAuctionBondDTO = new OrderAuctionBondDTO();
orderAuctionBondDTO.setAuctionSalesroomId(auctionSalesroom.getId());
--
Gitblit v1.7.1