From e45091fdf9e412c758bc320f3f5664081631fa4b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 12 六月 2024 20:58:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 1021e7c..a591c8f 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
@@ -90,11 +90,7 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -203,7 +199,7 @@
@Override
public List<AuctionSalesroom> getAuctionBidRecordList(AuctionSalesroomDTO ationSalesroomGoodsDTO) {
LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
- wrapper.eq(AuctionSalesroom::getSalesroomName,ationSalesroomGoodsDTO.getSalesroomName());
+ wrapper.like(AuctionSalesroom::getSalesroomName,ationSalesroomGoodsDTO.getSalesroomName());
wrapper.eq(AuctionSalesroom::getDelFlag,0);
List<AuctionSalesroom> page1 = this.list(wrapper);
return page1;
@@ -824,9 +820,16 @@
page.setSize(memberAuctionSalesroomDTO.getPageSize());
page.setCurrent(memberAuctionSalesroomDTO.getPageCurr());
MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO=new MemberAuctionSalesroomWdDTO();
- memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList);
- if(memberAuctionSalesroomWdDTO.getStatus()!=4){
- memberAuctionSalesroomWdDTO.setStatus(memberAuctionSalesroomWdDTO.getStatus());
+ if (goodsSkuIdList.size()>0){
+ memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList);
+ }else{
+ Set<Long> goodsSkuIdList1 = new HashSet<>();
+ goodsSkuIdList1.add(0L);
+ memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList1);
+ }
+
+ if(MemberAuctionSalesroomDTO.getStatus()!=4){
+ memberAuctionSalesroomWdDTO.setStatus(MemberAuctionSalesroomDTO.getStatus());
}
List<AuctionSalesroom> auctionSalesroomList=auctionSalesroomMapper.pageMemberAuctionSalesroomWdList(page,memberAuctionSalesroomWdDTO);
List<WdMemberAuctionSalesroomVO> List=new ArrayList<>();
@@ -841,7 +844,10 @@
memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
memberAuctionSalesroomDTO1.setMemberId(MemberAuctionSalesroomDTO.getMemberId());
List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
- memberAuctionSalesroomVO.setBondTime(data1.get(0).getCreateTime());
+ if (data1.size()>0){
+ memberAuctionSalesroomVO.setBondTime(data1.get(0).getCreateTime());
+ }
+
List.add(memberAuctionSalesroomVO);
}
page.setRecords(List);
--
Gitblit v1.7.1