order list finish

src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java

@@ -1,5 +1,6 @@
 package com.peanut.modules.book.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.modules.book.entity.BuyOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.peanut.modules.book.vo.request.BuyOrderListRequestVo;
@@ -19,4 +20,6 @@ import java.util.List;
 public interface BuyOrderDao extends BaseMapper<BuyOrder> {
     List<BuyOrder> orderList(BuyOrderListRequestVo requestVo);
 
+    Page<BuyOrder> testPage(Page<BuyOrder> page);
+
 }

src/main/java/com/peanut/modules/book/entity/BuyOrder.java

@@ -39,6 +39,7 @@ public class BuyOrder implements Serializable {
     /**
      * 收货人姓名
      */
+    @TableField("shipping_user")
     private String shippingUser;
     /**
      * 收货人手机号

src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.ExcludeEmptyQueryWrapper;
@@ -54,8 +55,6 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
     @Autowired
     ShopProductService shopProductService;
 
-    @Autowired
-    private BuyOrderDao buyOrderDao;
     @Autowired
     private BuyOrderProductService buyOrderProductService;
 
@@ -293,7 +292,14 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
 
     @Override
     public List<BuyOrderListResponseVo> orderList(BuyOrderListRequestVo requestVo) {
-        List<BuyOrder> buyOrderList = buyOrderDao.orderList(requestVo);
+        Page<BuyOrder> userPage = new Page<>(requestVo.getPageIndex(), requestVo.getPageSize());
+        QueryWrapper<BuyOrder> buyOrderQueryWrapper = new QueryWrapper<>();
+        buyOrderQueryWrapper.like(StringUtils.isNotBlank(requestVo.getSearchKeyWord()), "order_sn", 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());
+        IPage<BuyOrder> page = page(userPage, buyOrderQueryWrapper);
+        List<BuyOrder> buyOrderList = page.getRecords();
         List<BuyOrderListResponseVo> result = new ArrayList<>();
         for (BuyOrder buyOrder : buyOrderList) {
             BuyOrderListResponseVo responseVo = new BuyOrderListResponseVo();
@@ -329,7 +335,6 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
                 goodsResponseVoList.add(goodsResponseVo);
             }
             responseVo.setGoodsList(goodsResponseVoList);
-            requestVo.setIndex((requestVo.getIndex() - 1) * requestVo.getPageSize());
             result.add(responseVo);
         }
         return result;

src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java

@@ -34,7 +34,7 @@ public class BuyOrderListRequestVo {
     /**
      * 订单状态
      */
-    private Integer orderStatus;
+    private String orderStatus;
     /**
      * 数据起始位置
      */

src/main/resources/application-dev.yml

@@ -17,9 +17,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://59.110.212.44:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+      url: jdbc:mysql://127.0.0.1:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
       username: root
-      password: HSXY1234hsxy
+      password: password
       initial-size: 10
       max-active: 100
       min-idle: 10

src/main/resources/mapper/book/BuyOrderDao.xml

@@ -70,10 +70,16 @@
     </select>
 
     <select id="orderList" resultType="com.peanut.modules.book.entity.BuyOrder"
-            parameterType="com.peanut.modules.book.vo.request.BuyOrderListRequestVo">
+            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
         <where>
+            <if test="searchKeyWord != null">
+                order_sn like #{searchKeyWord}
+            </if>
             <if test="orderStatus != null">
                 and order_status = #{orderStatus}
             </if>
@@ -83,10 +89,6 @@
             <if test="endTime != null">
                 and create_time &lt;= #{endTime}
             </if>
-            <if test="searchKeyWord != null">
-                and order_sn like %#{searchKeyWord}%
-            </if>
-
         </where>
         limit #{index},#{pageSize}
     </select>