From fbc7e749abe186ea874d06e93e50465429fcd832 Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期一, 22 七月 2024 16:46:00 +0800 Subject: [PATCH] 修改bug --- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 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..5cd94ed 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(); -- Gitblit v1.7.1