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/MemberAuctionCollectionServiceImpl.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java
index 1df4496..552c596 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java
@@ -21,6 +21,7 @@
import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -90,17 +91,37 @@
}
AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO();
auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);
+ Set<Long> goodsSkuIdList1 = new HashSet<>();
+ if (StringUtils.isNotEmpty(goodsSkuIdList)){
+ for (Long i:goodsSkuIdList){
+ 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){
+ goodsSkuIdList1.add(a.getId());
+ }
+
+ }
+
+ }
+
Page<AuctionGoodsListVO> page = new Page<>();
page.setSize(auctionCollectionDTO.getPageSize());
page.setCurrent(auctionCollectionDTO.getPageCurr());
- LambdaQueryWrapper< MemberAuctionCollection> wrapper= Wrappers.lambdaQuery();
+ LambdaQueryWrapper<MemberAuctionCollection> wrapper= Wrappers.lambdaQuery();
wrapper.eq(MemberAuctionCollection::getMemberId,auctionCollectionDTO.getMemberId());
if (StringUtils.isNotEmpty(auctionCollectionDTO.getGoodsSkuName())){
- if (goodsSkuIdList.size()>0){
- wrapper.in(MemberAuctionCollection::getTargetId,goodsSkuIdList);
+ if (goodsSkuIdList1.size()>0){
+ wrapper.in(MemberAuctionCollection::getTargetId,goodsSkuIdList1);
+ }else{
+ goodsSkuIdList1=new HashSet<>();
+ goodsSkuIdList1.add(0L);
+ wrapper.in(MemberAuctionCollection::getTargetId,goodsSkuIdList1);
}
}
+ wrapper.orderByDesc(MemberAuctionCollection::getCreateTime);
List<MemberAuctionCollection> list = this.list(wrapper);
List<AuctionGoodsListVO> auctionGoodsVOS=new ArrayList<>();
--
Gitblit v1.7.1