From a88a12fd768d7d7d5f330e0f5a6d038c413fce55 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Fri, 8 Dec 2023 16:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=80=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peanut/modules/book/dao/BuyOrderDao.java  |  2 +-
 .../service/impl/BuyOrderServiceImpl.java     |  7 ++-
 .../resources/mapper/book/BuyOrderDao.xml     | 55 ++++++++++---------
 3 files changed, 34 insertions(+), 30 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 874c26b9..4657bfe5 100644
--- a/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java
+++ b/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java
@@ -18,7 +18,7 @@ import java.util.List;
 @Mapper
 public interface BuyOrderDao extends BaseMapper<BuyOrder> {
     List<BuyOrder> orderList(BuyOrderListRequestVo requestVo);
-    List<BuyOrder> orderListCount(BuyOrderListRequestVo requestVo);
+    int 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 9a0235bf..652ba069 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
@@ -422,14 +422,17 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         List<BuyOrderResponseVo> data = new ArrayList<>();
         requestVo.setIndex((requestVo.getPageIndex()-1)*10);
         List<BuyOrder> buyOrderList = buyOrderDao.orderList(requestVo);
-        int count = buyOrderDao.orderListCount(requestVo).size();
+        int count = buyOrderDao.orderListCount(requestVo);
         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;
+        Integer totalPage = totalSize / requestVo.getPageSize();
+        if (totalSize % requestVo.getPageSize()!=0){
+            totalPage = totalPage + 1;
+        }
         result.put("totalDataSize", totalSize);
         result.put("totalPage", totalPage);
         result.put("data", data);
diff --git a/src/main/resources/mapper/book/BuyOrderDao.xml b/src/main/resources/mapper/book/BuyOrderDao.xml
index 414e3f0f..6050501c 100644
--- a/src/main/resources/mapper/book/BuyOrderDao.xml
+++ b/src/main/resources/mapper/book/BuyOrderDao.xml
@@ -81,38 +81,39 @@
 
     </select>
 
-    <select id="orderListCount" resultType="com.peanut.modules.book.entity.BuyOrder"
-            parameterType="com.peanut.modules.book.vo.request.BuyOrderListRequestVo" resultMap="buyOrderMap">
+    <select id="orderListCount" resultType="int" parameterType="com.peanut.modules.book.vo.request.BuyOrderListRequestVo">
+        select count(1) from (
         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 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>
+            <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!= ''">
-                and (s.product_name like concat('%',concat(#{productName},'%')))
+                group by b.order_id
             </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>
+        ) t
     </select>
 
     <select id="orderList" resultType="com.peanut.modules.book.entity.BuyOrder"