From d93391fbf962d8c6080a87881b02da3def182497 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 7 Dec 2023 15:38:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8C=89=E7=85=A7=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peanut/modules/book/dao/BuyOrderDao.java  |  1 +
 .../service/impl/BuyOrderServiceImpl.java     | 21 +++---
 .../vo/request/BuyOrderListRequestVo.java     |  4 ++
 .../resources/mapper/book/BuyOrderDao.xml     | 70 +++++++++++++++----
 4 files changed, 71 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java b/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java
index bd0562fc..874c26b9 100644
--- a/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java
+++ b/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java
@@ -18,6 +18,7 @@ import java.util.List;
 @Mapper
 public interface BuyOrderDao extends BaseMapper<BuyOrder> {
     List<BuyOrder> orderList(BuyOrderListRequestVo requestVo);
+    List<BuyOrder> orderListCount(BuyOrderListRequestVo requestVo);
 
     List<BuyOrder> orderStatusNum(Integer userId);
 
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 0c7bc6c7..604ba790 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
@@ -68,6 +68,9 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
     @Autowired
     private BookService bookService;
 
+    @Autowired
+    private BuyOrderDao buyOrderDao;
+
     @Autowired
     private BuyOrderProductService buyOrderProductService;
 
@@ -352,25 +355,17 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
 
     @Override
     public Map<String, Object> orderList(BuyOrderListRequestVo requestVo) {
-        Page<BuyOrder> buyOrderPage = new Page<>(requestVo.getPageIndex(), requestVo.getPageSize());
         List<BuyOrderResponseVo> data = new ArrayList<>();
-        QueryWrapper<BuyOrder> buyOrderQueryWrapper = new QueryWrapper<>();
-        buyOrderQueryWrapper.and(StringUtils.isNotBlank(requestVo.getSearchKeyWord()),t->t.like("order_sn", requestVo.getSearchKeyWord()).or().like("shipping_user", requestVo.getSearchKeyWord()).or().like("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());
-        buyOrderQueryWrapper.eq("order_type","order");
-        buyOrderQueryWrapper.orderByDesc("create_time");
-
-        Integer totalSize = list(buyOrderQueryWrapper).size();
-        Integer totalPage = totalSize / requestVo.getPageSize() + 1;
-        Page<BuyOrder> page = page(buyOrderPage, buyOrderQueryWrapper);
-        List<BuyOrder> buyOrderList = page.getRecords();
+        requestVo.setIndex((requestVo.getPageIndex()-1)*10);
+        List<BuyOrder> buyOrderList = buyOrderDao.orderList(requestVo);
+        int count = buyOrderDao.orderListCount(requestVo).size();
         for (BuyOrder buyOrder : buyOrderList) {
             BuyOrderResponseVo responseVo = setBuyOrderInfo(buyOrder);
             data.add(responseVo);
         }
         Map<String, Object> result = new HashMap<>();
+        Integer totalSize = count;
+        Integer totalPage = totalSize / requestVo.getPageSize() + 1;
         result.put("totalDataSize", totalSize);
         result.put("totalPage", totalPage);
         result.put("data", data);
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 a7a3ec4c..35234cde 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
@@ -27,6 +27,10 @@ public class BuyOrderListRequestVo {
      * 搜索关键词
      */
     private String searchKeyWord;
+    /**
+     * 商品名称
+     */
+    private String productName;
     /**
      * 开始时间
      */
diff --git a/src/main/resources/mapper/book/BuyOrderDao.xml b/src/main/resources/mapper/book/BuyOrderDao.xml
index 57e9195e..dcff1780 100644
--- a/src/main/resources/mapper/book/BuyOrderDao.xml
+++ b/src/main/resources/mapper/book/BuyOrderDao.xml
@@ -81,27 +81,73 @@
 
     </select>
 
-    <select id="orderList" resultType="com.peanut.modules.book.entity.BuyOrder"
+    <select id="orderListCount" resultType="com.peanut.modules.book.entity.BuyOrder"
             parameterType="com.peanut.modules.book.vo.request.BuyOrderListRequestVo" resultMap="buyOrderMap">
-<!--
-        select order_sn, province, city, district, user_phone, address, payment_method, order_status, remark
-    -->
-        select *
-        from buy_order
+        select b.*
+        from buy_order b
+        <if test="productName != null and productName!= ''">
+            left join buy_order_product p on b.order_id = p.order_id
+            left join shop_product s on s.product_id = p.product_id
+        </if>
         <where>
-            <if test="searchKeyWord != null">
-                order_sn like #{searchKeyWord}
+            <if test="searchKeyWord != null and searchKeyWord!= ''">
+                and (b.order_sn like concat('%',concat(#{searchKeyWord},'%'))
+                or b.shipping_user like concat('%',concat(#{searchKeyWord},'%'))
+                or b.user_phone like concat('%',concat(#{searchKeyWord},'%')))
             </if>
-            <if test="orderStatus != null">
-                and order_status = #{orderStatus}
+            <if test="productName != null and productName!= ''">
+                and (s.product_name like concat('%',concat(#{productName},'%')))
+            </if>
+            <if test="orderStatus != null and orderStatus!= ''">
+                and b.order_status = #{orderStatus}
             </if>
             <if test="startTime != null">
-                and create_time &gt;= #{startTime}
+                and b.create_time &gt;= #{startTime}
             </if>
             <if test="endTime != null">
-                and create_time &lt;= #{endTime}
+                and b.create_time &lt;= #{endTime}
             </if>
+            and b.order_type = 'order'
+            and b.del_flag = 0
         </where>
+        <if test="productName != null and productName!= ''">
+            group by b.order_id
+        </if>
+    </select>
+
+    <select id="orderList" resultType="com.peanut.modules.book.entity.BuyOrder"
+            parameterType="com.peanut.modules.book.vo.request.BuyOrderListRequestVo" resultMap="buyOrderMap">
+        select b.*
+        from buy_order b
+        <if test="productName != null and productName!= ''">
+            left join buy_order_product p on b.order_id = p.order_id
+            left join shop_product s on s.product_id = p.product_id
+        </if>
+        <where>
+            <if test="searchKeyWord != null and searchKeyWord!= ''">
+                and (b.order_sn like concat('%',concat(#{searchKeyWord},'%'))
+                or b.shipping_user like concat('%',concat(#{searchKeyWord},'%'))
+                or b.user_phone like concat('%',concat(#{searchKeyWord},'%')))
+            </if>
+            <if test="productName != null and productName!= ''">
+                and (s.product_name like concat('%',concat(#{productName},'%')))
+            </if>
+            <if test="orderStatus != null and orderStatus!= ''">
+                and b.order_status = #{orderStatus}
+            </if>
+            <if test="startTime != null">
+                and b.create_time &gt;= #{startTime}
+            </if>
+            <if test="endTime != null">
+                and b.create_time &lt;= #{endTime}
+            </if>
+            and b.order_type = 'order'
+            and b.del_flag = 0
+        </where>
+        <if test="productName != null and productName!= ''">
+            group by b.order_id
+        </if>
+        order by b.create_time desc
         limit #{index},#{pageSize}
     </select>