From 9062b525748585c5f55b601f89e2ac9730077549 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Mon, 30 Jun 2025 15:39:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E5=95=86=E5=93=81=E5=90=8D=E6=9F=A5=E8=AF=A2vip?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BuyOrderServiceImpl.java     | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

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<BuyOrderDao, BuyOrder> 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<BuyOrderProduct> buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>();
-            buyOrderProductMPJLambdaWrapper.selectAll(BuyOrderProduct.class);
-            buyOrderProductMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId);
-            buyOrderProductMPJLambdaWrapper.like(ShopProduct::getProductName,requestVo.getProductName());
-            List<Integer> 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<VipBuyConfigEntity> vbcWrapper = new LambdaQueryWrapper<>();
+                vbcWrapper.like(VipBuyConfigEntity::getTitle,requestVo.getProductName());
+                List<Integer> collect = vipBuyConfigService.list(vbcWrapper).stream().map(VipBuyConfigEntity::getId).collect(Collectors.toList());
+                if (collect.size()>0){
+                    wrapper.in(BuyOrder::getVipBuyConfigId,collect);
+                }
+            }else {
+                MPJLambdaWrapper<BuyOrderProduct> buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>();
+                buyOrderProductMPJLambdaWrapper.selectAll(BuyOrderProduct.class);
+                buyOrderProductMPJLambdaWrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,BuyOrderProduct::getProductId);
+                buyOrderProductMPJLambdaWrapper.like(ShopProduct::getProductName,requestVo.getProductName());
+                List<Integer> 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<BuyOrderProduct> buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>();