From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
index 418faaa..e9f0336 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
@@ -83,11 +83,31 @@
goodsSkuIdList1 = goodsSku.stream().map(GoodsSku::getId)
.collect(Collectors.toSet());
}
- Set<Long> goodsSkuIdList2 =null;
+
+ Set<Long> goodsSkuIdList3 =new HashSet<>();
if (StringUtils.isNotEmpty(goodsSkuIdList1)){
- goodsSkuIdList.retainAll(goodsSkuIdList1);
- goodsSkuIdList2=goodsSkuIdList;
- }else {
+ for (Long i:goodsSkuIdList1){
+ LambdaQueryWrapper<AuctionGoods> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(AuctionGoods::getGoodsSkuId,i);
+ wrapper.eq(AuctionGoods::getDelFlag,0);
+ List<AuctionGoods> auctionGoods = auctionGoodsMapper.selectList(wrapper);
+ for (AuctionGoods a:auctionGoods){
+ goodsSkuIdList3.add(a.getId());
+ }
+
+ }
+
+ }
+ Set<Long> goodsSkuIdList2 =new HashSet<>();
+ if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) {
+ if (goodsSkuIdList3.size() > 0) {
+ goodsSkuIdList2 = goodsSkuIdList.stream()
+ .filter(goodsSkuIdList3::contains)
+ .collect(Collectors.toSet());
+ } else {
+ goodsSkuIdList2.add(0L);;
+ }
+ }else{
goodsSkuIdList2=goodsSkuIdList;
}
@@ -96,16 +116,13 @@
page.setSize(auctionGoodsListDTO.getPageSize());
page.setCurrent(auctionGoodsListDTO.getPageCurr());
AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO();
- if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) {
- if (StringUtils.isNotEmpty(goodsSkuIdList2)){
+ if (goodsSkuIdList2.size()>0){
auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList2);
}else{
- goodsSkuIdList2=new HashSet<>();
goodsSkuIdList2.add(0L);
auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList2);
}
- }
- List<AuctionGoods> auctionGoodsPgeList = auctionGoodsMapper.getAuctionGoodsPgeList(page, auctionGoodsListPageDTO);
+ List<AuctionGoods> auctionGoodsPgeList = auctionGoodsMapper.getAuctionGoodsPgeList1(page, auctionGoodsListPageDTO);
List<AuctionGoodsListVO> auctionGoodsVOS=new ArrayList<>();
for (AuctionGoods auctionGoods:auctionGoodsPgeList){
AuctionGoodsListVO auctionGoodsVO=new AuctionGoodsListVO();
@@ -163,26 +180,26 @@
PageDTO<WdMemberAuctionSalesroomVO> wdMemberAuctionSalesroomVOPageDTO = PageDTO.of(auctionSalesroomList, WdMemberAuctionSalesroomVO.class);
List<WdMemberAuctionSalesroomVO> list1 = wdMemberAuctionSalesroomVOPageDTO.getList();
for (WdMemberAuctionSalesroomVO auctionSalesroom:list1){
- WdMemberAuctionSalesroomVO memberAuctionSalesroomVO=new WdMemberAuctionSalesroomVO();
- memberAuctionSalesroomVO.setSalesroomName(auctionSalesroom.getSalesroomName());
- memberAuctionSalesroomVO.setDescription(auctionSalesroom.getDescription());
- memberAuctionSalesroomVO.setStatus(auctionSalesroom.getStatus());
- memberAuctionSalesroomVO.setSalesroomId(auctionSalesroom.getId());
- memberAuctionSalesroomVO.setCoverPic(auctionSalesroom.getCoverPic());
+ auctionSalesroom.setSalesroomName(auctionSalesroom.getSalesroomName());
+ auctionSalesroom.setDescription(auctionSalesroom.getDescription());
+ auctionSalesroom.setStatus(auctionSalesroom.getStatus());
+ auctionSalesroom.setSalesroomId(auctionSalesroom.getId());
+ auctionSalesroom.setId(auctionSalesroom.getId());
+ auctionSalesroom.setCoverPic(auctionSalesroom.getCoverPic());
MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
memberAuctionSalesroomDTO1.setMemberId(MemberAuctionSalesroomDTO.getMemberId());
List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
if (data1.size()>0){
- memberAuctionSalesroomVO.setIsBond(2);
+ auctionSalesroom.setIsBond(2);
}else{
- memberAuctionSalesroomVO.setIsBond(1);
+ auctionSalesroom.setIsBond(1);
}
MemberAuctionSalesroomDTO memberAuctionSalesroomDTO2=new MemberAuctionSalesroomDTO();
memberAuctionSalesroomDTO2.setAuctionSalesroomId(auctionSalesroom.getId());
List<OrderAuctionBond> data2 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO2, SecurityConstants.INNER).getData();
- memberAuctionSalesroomVO.setBondNum(data2.size());
- memberAuctionSalesroomVO.setBond(auctionSalesroom.getBond());
+ auctionSalesroom.setBondNum(data2.size());
+ auctionSalesroom.setBond(auctionSalesroom.getBond());
}
return wdMemberAuctionSalesroomVOPageDTO;
}
--
Gitblit v1.7.1