diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index 4f210825..569a41c7 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -372,12 +372,23 @@ public class BuyOrderServiceImpl extends ServiceImpl impl wrapper.orderByDesc(BuyOrder::getCreateTime); wrapper.and(StringUtils.isNotBlank(requestVo.getSearchKeyWord()),t->t.like(BuyOrder::getOrderSn,requestVo.getSearchKeyWord()).or().like(MyUserEntity::getTel,requestVo.getSearchKeyWord()).or().like(MyUserEntity::getEmail,requestVo.getSearchKeyWord()).or().like(MyUserEntity::getName,requestVo.getSearchKeyWord()).or().like(BuyOrder::getShippingUser,requestVo.getSearchKeyWord()).or().like(BuyOrder::getUserPhone,requestVo.getSearchKeyWord())); if(StringUtils.isNotBlank(requestVo.getProductName())){ - MPJLambdaWrapper buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>(); - buyOrderProductMPJLambdaWrapper.selectAll(BuyOrderProduct.class); - buyOrderProductMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId); - buyOrderProductMPJLambdaWrapper.like(ShopProduct::getProductName,requestVo.getProductName()); - List collect = buyOrderProductDao.selectJoinList(BuyOrderProduct.class, buyOrderProductMPJLambdaWrapper).stream().map(BuyOrderProduct::getOrderId).collect(Collectors.toList()); - wrapper.in(BuyOrder::getOrderId,collect); + if (requestVo.getProductName().contains("vip")||requestVo.getProductName().contains("VIP")){ + LambdaQueryWrapper vbcWrapper = new LambdaQueryWrapper<>(); + vbcWrapper.like(VipBuyConfigEntity::getTitle,requestVo.getProductName()); + List collect = vipBuyConfigService.list(vbcWrapper).stream().map(VipBuyConfigEntity::getId).collect(Collectors.toList()); + if (collect.size()>0){ + wrapper.in(BuyOrder::getVipBuyConfigId,collect); + } + }else { + MPJLambdaWrapper buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>(); + buyOrderProductMPJLambdaWrapper.selectAll(BuyOrderProduct.class); + buyOrderProductMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId); + buyOrderProductMPJLambdaWrapper.like(ShopProduct::getProductName,requestVo.getProductName()); + List collect = buyOrderProductDao.selectJoinList(BuyOrderProduct.class, buyOrderProductMPJLambdaWrapper).stream().map(BuyOrderProduct::getOrderId).collect(Collectors.toList()); + if (collect.size()>0){ + wrapper.in(BuyOrder::getOrderId,collect); + } + } } if(requestVo.getFilterPresale()!=null&&requestVo.getFilterPresale()==1){ MPJLambdaWrapper buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>();