From fd97cde3d994a3aa6898ba862cd20d0c081012c3 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 六月 2024 18:44:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 25a006c..dcb1616 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
@@ -392,8 +392,14 @@
MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
- memberAuctionSalesroomVO.setApplyNum(data1.size());
- List.add(memberAuctionSalesroomVO);
+ if(data1!=null){
+ memberAuctionSalesroomVO.setApplyNum(data1.size());
+ List.add(memberAuctionSalesroomVO);
+ }else{
+ memberAuctionSalesroomVO.setApplyNum(0);
+ }
+
+
}
page.setRecords(List);
return PageDTO.of(page);
@@ -625,11 +631,11 @@
}else {
AuctionGoods byId = auctionGoodsService.getById(bidVO.getTargetId());
- if (byId.getStartingPrice().doubleValue()<bidVO.getLastBidAmount().doubleValue()){
+ if (byId.getStartingPrice().doubleValue()>bidVO.getLastBidAmount().doubleValue()){
throw new ServiceException("出价不能比起拍价低");
}
BigDecimal bigDecimal=byId.getStartingPrice().add(byId.getMinimumMarkupAmount());
- if (bigDecimal.doubleValue()<bidVO.getLastBidAmount().doubleValue()){
+ if (bigDecimal.doubleValue()>bidVO.getLastBidAmount().doubleValue()){
throw new ServiceException("出价不能比每次最少加价低");
}
LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
--
Gitblit v1.7.1