From a1b70c8d4f9d41a6f959352f32a8e8da2366ff65 Mon Sep 17 00:00:00 2001 From: Cauchy Date: Fri, 20 Oct 2023 10:47:33 +0800 Subject: [PATCH] order list finish --- .../com/peanut/modules/book/dao/BuyOrderDao.java | 3 +++ .../com/peanut/modules/book/entity/BuyOrder.java | 1 + .../book/service/impl/BuyOrderServiceImpl.java | 13 +++++++++---- .../book/vo/request/BuyOrderListRequestVo.java | 2 +- src/main/resources/application-dev.yml | 4 ++-- src/main/resources/mapper/book/BuyOrderDao.xml | 12 +++++++----- 6 files changed, 23 insertions(+), 12 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 ee60c5a9..a28f8a9b 100644 --- a/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java +++ b/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 { List orderList(BuyOrderListRequestVo requestVo); + Page testPage(Page page); + } diff --git a/src/main/java/com/peanut/modules/book/entity/BuyOrder.java b/src/main/java/com/peanut/modules/book/entity/BuyOrder.java index 092f90a8..c2f89d9e 100644 --- a/src/main/java/com/peanut/modules/book/entity/BuyOrder.java +++ b/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; /** * 收货人手机号 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 ba4e09df..f1027164 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 @@ -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 impl @Autowired ShopProductService shopProductService; - @Autowired - private BuyOrderDao buyOrderDao; @Autowired private BuyOrderProductService buyOrderProductService; @@ -293,7 +292,14 @@ public class BuyOrderServiceImpl extends ServiceImpl impl @Override public List orderList(BuyOrderListRequestVo requestVo) { - List buyOrderList = buyOrderDao.orderList(requestVo); + Page userPage = new Page<>(requestVo.getPageIndex(), requestVo.getPageSize()); + QueryWrapper 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 page = page(userPage, buyOrderQueryWrapper); + List buyOrderList = page.getRecords(); List result = new ArrayList<>(); for (BuyOrder buyOrder : buyOrderList) { BuyOrderListResponseVo responseVo = new BuyOrderListResponseVo(); @@ -329,7 +335,6 @@ public class BuyOrderServiceImpl extends ServiceImpl impl goodsResponseVoList.add(goodsResponseVo); } responseVo.setGoodsList(goodsResponseVoList); - requestVo.setIndex((requestVo.getIndex() - 1) * requestVo.getPageSize()); result.add(responseVo); } return result; 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 e9a35f3e..eecab5f1 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 @@ -34,7 +34,7 @@ public class BuyOrderListRequestVo { /** * 订单状态 */ - private Integer orderStatus; + private String orderStatus; /** * 数据起始位置 */ diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index d2c33f8d..038b687d 100644 --- a/src/main/resources/application-dev.yml +++ b/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 diff --git a/src/main/resources/mapper/book/BuyOrderDao.xml b/src/main/resources/mapper/book/BuyOrderDao.xml index d6520c67..c85cd4b2 100644 --- a/src/main/resources/mapper/book/BuyOrderDao.xml +++ b/src/main/resources/mapper/book/BuyOrderDao.xml @@ -70,10 +70,16 @@