From 1d81e94a38b6173aa2105de4a51ada1e1511ac00 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Fri, 6 Dec 2024 16:54:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E9=A2=84=E5=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/book/service/impl/BuyOrderServiceImpl.java    | 8 ++++++++
 .../modules/book/vo/request/BuyOrderListRequestVo.java    | 4 ++++
 2 files changed, 12 insertions(+)

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<BuyOrderDao, BuyOrder> impl
             List<Integer> 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<BuyOrderProduct> buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>();
+            buyOrderProductMPJLambdaWrapper.selectAll(BuyOrderProduct.class);
+            buyOrderProductMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId);
+            buyOrderProductMPJLambdaWrapper.ne(ShopProduct::getGoodsType,"03");
+            List<Integer> collect = buyOrderProductDao.selectJoinList(BuyOrderProduct.class, buyOrderProductMPJLambdaWrapper).stream().map(BuyOrderProduct::getOrderId).collect(Collectors.toList());
+            wrapper.in(BuyOrder::getOrderId,collect);
+        }
         Page<BuyOrder> buyOrderPage = getBaseMapper().selectPage(new Page<BuyOrder>(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;
     /**
      * 开始时间
      */