From f723f86d3e8c9bbf58eac3225a63e8b5b01828e6 Mon Sep 17 00:00:00 2001
From: Cauchy <mailcauchy@gmail.com>
Date: Wed, 25 Oct 2023 11:09:13 +0800
Subject: [PATCH] optimize

---
 .../java/com/peanut/modules/book/entity/BuyOrderProduct.java | 4 ++++
 .../modules/book/service/impl/BuyOrderServiceImpl.java       | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/peanut/modules/book/entity/BuyOrderProduct.java b/src/main/java/com/peanut/modules/book/entity/BuyOrderProduct.java
index 014471f3..66e14265 100644
--- a/src/main/java/com/peanut/modules/book/entity/BuyOrderProduct.java
+++ b/src/main/java/com/peanut/modules/book/entity/BuyOrderProduct.java
@@ -45,4 +45,8 @@ public class BuyOrderProduct {
      * 删除标识
      */
     private int delFlag;
+    /**
+     * 发货标识
+     */
+    private int shipped;
 }
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 7498a226..c2e6ce19 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
@@ -315,7 +315,9 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         Page<BuyOrder> buyOrderPage = new Page<>(requestVo.getPageIndex(), requestVo.getPageSize());
         List<BuyOrderResponseVo> data = new ArrayList<>();
         QueryWrapper<BuyOrder> buyOrderQueryWrapper = new QueryWrapper<>();
-        buyOrderQueryWrapper.like(StringUtils.isNotBlank(requestVo.getSearchKeyWord()), "order_sn", requestVo.getSearchKeyWord());
+        buyOrderQueryWrapper.like(StringUtils.isNotBlank(requestVo.getSearchKeyWord()), "order_sn", requestVo.getSearchKeyWord())
+                .or().like(StringUtils.isNotBlank(requestVo.getSearchKeyWord()), "shipping_user", requestVo.getSearchKeyWord())
+                .or().like(StringUtils.isNotBlank(requestVo.getSearchKeyWord()), "user_phone", requestVo.getSearchKeyWord());
         buyOrderQueryWrapper.eq(StringUtils.isNotBlank(requestVo.getOrderStatus()), "order_status", requestVo.getOrderStatus());
         buyOrderQueryWrapper.gt(requestVo.getStartTime() != null, "create_time", requestVo.getStartTime());
         buyOrderQueryWrapper.lt(requestVo.getEndTime() != null, "create_time", requestVo.getStartTime());
@@ -393,6 +395,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         int expressOrderId = expressOrderService.getBaseMapper().insert(expressOrder);
         for (BuyOrderProduct buyOrderProduct : buyOrderProductList) {
             buyOrderProduct.setExpressOrderId(expressOrderId);
+            buyOrderProduct.setShipped(1);
         }
         buyOrderProductService.updateBatchById(buyOrderProductList);
         QueryWrapper<BuyOrder> buyOrderQueryWrapper = new QueryWrapper<>();