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 e0d27a2d..b4622e84 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 @@ -375,6 +375,14 @@ public class BuyOrderServiceImpl extends ServiceImpl impl List collect = buyOrderProductDao.selectJoinList(BuyOrderProduct.class, buyOrderProductMPJLambdaWrapper).stream().map(BuyOrderProduct::getOrderId).collect(Collectors.toList()); wrapper.in(BuyOrder::getOrderId,collect); } + if(requestVo.getFilterPresale()!=null&&requestVo.getFilterPresale()==1){ + MPJLambdaWrapper buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>(); + buyOrderProductMPJLambdaWrapper.selectAll(BuyOrderProduct.class); + buyOrderProductMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId); + buyOrderProductMPJLambdaWrapper.ne(ShopProduct::getGoodsType,"03"); + List collect = buyOrderProductDao.selectJoinList(BuyOrderProduct.class, buyOrderProductMPJLambdaWrapper).stream().map(BuyOrderProduct::getOrderId).collect(Collectors.toList()); + wrapper.in(BuyOrder::getOrderId,collect); + } Page buyOrderPage = getBaseMapper().selectPage(new Page(requestVo.getPageIndex(), requestVo.getPageSize()), wrapper); //丰富订单内容 for (BuyOrder b : buyOrderPage.getRecords()){ diff --git a/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java b/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java index 35234cde..6f6cf207 100644 --- a/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java +++ b/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java @@ -31,6 +31,10 @@ public class BuyOrderListRequestVo { * 商品名称 */ private String productName; + /** + * 过滤预售 + */ + private Integer filterPresale; /** * 开始时间 */