rentaiming
2024-07-22 fbc7e749abe186ea874d06e93e50465429fcd832
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java
@@ -91,21 +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{
                goodsSkuIdList=new HashSet<>();
                goodsSkuIdList.add(0L);
                wrapper.in(MemberAuctionCollection::getTargetId,goodsSkuIdList);
                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<>();