From 353ec2376201dbfaac3477262deb40bf35ad3154 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 19 七月 2024 14:06:23 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 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 63bc930..8a9e834 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
@@ -636,6 +636,11 @@
throw new ServiceException("出价不能比当前最高价低");
}
}
+ if (one3!=null){
+ if (bidVO.getLastBidAmount().doubleValue()<one3.getLastBidAmount().add(byId.getMinimumMarkupAmount()).doubleValue()){
+ throw new ServiceException("出价不能比当前最高价低加每次加价低");
+ }
+ }
BigDecimal bigDecimal=byId.getStartingPrice().add(byId.getMinimumMarkupAmount());
if (bigDecimal.doubleValue()>bidVO.getLastBidAmount().doubleValue()){
@@ -724,7 +729,6 @@
wrapper1.orderByDesc(AuctionBidRecord::getLastBidAmount);
wrapper1.last("limit 1");
AuctionBidRecord one = auctionBidRecordService.getOne(wrapper1);
- if (byId.getAuctionStock()==1) {
if (one != null) {
BigDecimal bigDecimal1 = one.getLastBidAmount().add(byId.getMinimumMarkupAmount());
if (bigDecimal1.doubleValue() > bidVO.getLastBidAmount().doubleValue()) {
@@ -732,8 +736,6 @@
}
}
- }
-
LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery();
wrapper3.eq(AuctionBidRecord::getTargetId,bidVO.getTargetId());
wrapper3.eq(AuctionBidRecord::getDelFlag,0);
@@ -751,7 +753,7 @@
one3.setAuctionSalesroomId(bidVO.getAuctionSalesroomId());
one3.setTargetId(bidVO.getTargetId());
one3.setMemberId(bidVO.getMemberId());
- if(membeOne.getRealName()!=null||membeOne.getRealName()!=""){
+ if(membeOne.getRealName()!=null&&membeOne.getRealName()!=""){
one3.setNickname(membeOne.getRealName());
}else{
one3.setNickname(membeOne.getNickname());
@@ -972,10 +974,10 @@
Set<Long> goodsSkuIdList = null;
goodsSkuIdList = data.stream().map(OrderAuctionBond::getAuctionSalesroomId)
.collect(Collectors.toSet());
- Page<WdMemberAuctionSalesroomVO> page = new Page<>();
+ Page<AuctionSalesroom> page = new Page<>();
page.setSize(memberAuctionSalesroomDTO.getPageSize());
page.setCurrent(memberAuctionSalesroomDTO.getPageCurr());
- MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO=new MemberAuctionSalesroomWdDTO();
+ /* MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO=new MemberAuctionSalesroomWdDTO();
if (goodsSkuIdList.size()>0){
memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList);
}else{
@@ -991,28 +993,49 @@
memberAuctionSalesroomWdDTO.setStatus(MemberAuctionSalesroomDTO.getStatus());
}
+ }*/
+
+ LambdaQueryWrapper<AuctionSalesroom> wrapper1=Wrappers.lambdaQuery();
+ if (goodsSkuIdList.size()>0){
+ wrapper1.in(AuctionSalesroom::getId,goodsSkuIdList);
+ }else{
+ Set<Long> goodsSkuIdList1 = new HashSet<>();
+ goodsSkuIdList1.add(0L);
+ wrapper1.in(AuctionSalesroom::getId,goodsSkuIdList);
}
- List<AuctionSalesroom> auctionSalesroomList=auctionSalesroomMapper.pageMemberAuctionSalesroomWdList(page,memberAuctionSalesroomWdDTO);
- List<WdMemberAuctionSalesroomVO> List=new ArrayList<>();
- for (AuctionSalesroom auctionSalesroom:auctionSalesroomList){
+ if (MemberAuctionSalesroomDTO.getSalesroomName()!=null){
+ wrapper1.like(AuctionSalesroom::getSalesroomName,MemberAuctionSalesroomDTO.getSalesroomName());
+ }
+ wrapper1.eq(AuctionSalesroom::getDelFlag,0);
+ if(MemberAuctionSalesroomDTO.getStatus()!=4){
+ wrapper1.eq(AuctionSalesroom::getStatus,MemberAuctionSalesroomDTO.getStatus());
+ }
+ wrapper1.last("ORDER BY\n" +
+ " CASE\n" +
+ " WHEN status = 0 THEN 2\n" +
+ " WHEN status = 1 THEN 1\n" +
+ " WHEN status = 2 THEN 3\n" +
+ " END,status");
+
+ Page<AuctionSalesroom> auctionSalesroomList=this.page(page,wrapper1);
+ PageDTO<WdMemberAuctionSalesroomVO> wdMemberAuctionSalesroomVOPageDTO = PageDTO.of(auctionSalesroomList, WdMemberAuctionSalesroomVO.class);
+ List<WdMemberAuctionSalesroomVO> list = wdMemberAuctionSalesroomVOPageDTO.getList();
+ for (WdMemberAuctionSalesroomVO auctionSalesroom:list){
WdMemberAuctionSalesroomVO memberAuctionSalesroomVO=new WdMemberAuctionSalesroomVO();
memberAuctionSalesroomVO.setSalesroomName(auctionSalesroom.getSalesroomName());
memberAuctionSalesroomVO.setDescription(auctionSalesroom.getDescription());
- memberAuctionSalesroomVO.setStatus(auctionSalesroom.getStatus().getCode());
+ memberAuctionSalesroomVO.setStatus(auctionSalesroom.getStatus());
memberAuctionSalesroomVO.setSalesroomId(auctionSalesroom.getId());
memberAuctionSalesroomVO.setCoverPic(auctionSalesroom.getCoverPic());
MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
- memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
- memberAuctionSalesroomDTO1.setMemberId(MemberAuctionSalesroomDTO.getMemberId());
+ memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getSalesroomId());
+ memberAuctionSalesroomDTO1.setMemberId(auctionSalesroom.getId());
List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
if (data1.size()>0){
memberAuctionSalesroomVO.setBondTime(data1.get(0).getCreateTime());
}
-
- List.add(memberAuctionSalesroomVO);
}
- page.setRecords(List);
- return PageDTO.of(page);
+ return wdMemberAuctionSalesroomVOPageDTO;
}
--
Gitblit v1.7.1