From 6d0b22c4a517b1f511b2d31c1586655b52832dbc Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Thu, 31 Jul 2025 23:59:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E6=94=B9?= =?UTF-8?q?=E6=88=90=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sczx/order/dto/OrderQueryReq.java | 4 +++- .../java/com/sczx/order/mapper/OrderMainMapper.java | 4 +++- .../java/com/sczx/order/repository/OrderMainRepo.java | 6 ++++-- .../sczx/order/repository/impl/OrderMainRepoImpl.java | 6 ++++-- .../com/sczx/order/service/impl/OrderServiceImpl.java | 10 ++++++---- src/main/resources/mapper/OrderMainMapper.xml | 7 +++++-- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/sczx/order/dto/OrderQueryReq.java b/src/main/java/com/sczx/order/dto/OrderQueryReq.java index c98d543..5270d65 100644 --- a/src/main/java/com/sczx/order/dto/OrderQueryReq.java +++ b/src/main/java/com/sczx/order/dto/OrderQueryReq.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @Author: 张黎 * @Date: 2025/07/30/16:02 @@ -21,5 +23,5 @@ public class OrderQueryReq { private Long customerId; @ApiModelProperty("订单状态") - private OrderStatusEnum orderStatus; + private List orderStatusList; } diff --git a/src/main/java/com/sczx/order/mapper/OrderMainMapper.java b/src/main/java/com/sczx/order/mapper/OrderMainMapper.java index 85f5ed8..9b71e87 100644 --- a/src/main/java/com/sczx/order/mapper/OrderMainMapper.java +++ b/src/main/java/com/sczx/order/mapper/OrderMainMapper.java @@ -8,6 +8,8 @@ import com.sczx.order.po.OrderMainPO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 租车订单信息 Mapper 接口 @@ -19,5 +21,5 @@ import org.apache.ibatis.annotations.Param; public interface OrderMainMapper extends BaseMapper { StoreOrderStatisticsDTO storeOrderStatistics(@Param("storeId") Long storeId); - IPage pageQueryOrder(Page page, @Param("customerId") Long customerId, @Param("storeId") Long storeId, @Param("orderStatus") String orderStatus); + IPage pageQueryOrder(Page page, @Param("customerId") Long customerId, @Param("storeId") Long storeId, @Param("orderStatusList") List orderStatusList); } diff --git a/src/main/java/com/sczx/order/repository/OrderMainRepo.java b/src/main/java/com/sczx/order/repository/OrderMainRepo.java index 0a82dad..88dc4b3 100644 --- a/src/main/java/com/sczx/order/repository/OrderMainRepo.java +++ b/src/main/java/com/sczx/order/repository/OrderMainRepo.java @@ -6,6 +6,8 @@ import com.sczx.order.dto.StoreOrderStatisticsDTO; import com.sczx.order.po.OrderMainPO; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 租车订单信息 服务类 @@ -24,8 +26,8 @@ public interface OrderMainRepo extends IService { * @param pageSize 每页条数 * @param customerId 客户ID * @param storeId 门店ID - * @param orderStatus 订单状态 + * @param orderStatusList 订单状态 * @return */ - IPage pageQueryOrder(Integer pageNo, Integer pageSize, Long customerId, Long storeId, String orderStatus); + IPage pageQueryOrder(Integer pageNo, Integer pageSize, Long customerId, Long storeId, List orderStatusList); } diff --git a/src/main/java/com/sczx/order/repository/impl/OrderMainRepoImpl.java b/src/main/java/com/sczx/order/repository/impl/OrderMainRepoImpl.java index 31c8325..2bd142a 100644 --- a/src/main/java/com/sczx/order/repository/impl/OrderMainRepoImpl.java +++ b/src/main/java/com/sczx/order/repository/impl/OrderMainRepoImpl.java @@ -10,6 +10,8 @@ import com.sczx.order.repository.OrderMainRepo; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 租车订单信息 服务实现类 @@ -27,8 +29,8 @@ public class OrderMainRepoImpl extends ServiceImpl } @Override - public IPage pageQueryOrder(Integer pageNo, Integer pageSize, Long customerId, Long storeId, String orderStatus) { + public IPage pageQueryOrder(Integer pageNo, Integer pageSize, Long customerId, Long storeId, List orderStatusList) { Page page = new Page<>(pageNo, pageSize); - return this.getBaseMapper().pageQueryOrder(page, customerId, storeId, orderStatus); + return this.getBaseMapper().pageQueryOrder(page, customerId, storeId, orderStatusList); } } diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java index 8125d5d..4383019 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -36,6 +36,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; @Slf4j @Service @@ -276,13 +277,14 @@ public class OrderServiceImpl implements OrderService { @Override public IPage pageCustOrder(Integer pageNo, Integer pageSize, OrderQueryReq orderQueryReq) { orderQueryReq.setCustomerId(Long.valueOf(jwtUtil.getUserInfoFromToken().getUserId().toString())); - String orderStatusCode = orderQueryReq.getOrderStatus() == null ? null : orderQueryReq.getOrderStatus().getCode(); - return orderMainRepo.pageQueryOrder(pageNo, pageSize, orderQueryReq.getCustomerId(), orderQueryReq.getStoreId(), orderStatusCode); + List orderStatusList = orderQueryReq.getOrderStatusList().stream().map(OrderStatusEnum::getCode).collect(Collectors.toList()); + return orderMainRepo.pageQueryOrder(pageNo, pageSize, orderQueryReq.getCustomerId(), orderQueryReq.getStoreId(), orderStatusList); } @Override public IPage pageStoreOrder(Integer pageNo, Integer pageSize, OrderQueryReq orderQueryReq) { - String orderStatusCode = orderQueryReq.getOrderStatus() == null ? null : orderQueryReq.getOrderStatus().getCode(); - return orderMainRepo.pageQueryOrder(pageNo, pageSize, orderQueryReq.getCustomerId(), orderQueryReq.getStoreId(), orderStatusCode); + + List orderStatusList = orderQueryReq.getOrderStatusList().stream().map(OrderStatusEnum::getCode).collect(Collectors.toList()); + return orderMainRepo.pageQueryOrder(pageNo, pageSize, orderQueryReq.getCustomerId(), orderQueryReq.getStoreId(), orderStatusList); } } diff --git a/src/main/resources/mapper/OrderMainMapper.xml b/src/main/resources/mapper/OrderMainMapper.xml index a2b6550..7813297 100644 --- a/src/main/resources/mapper/OrderMainMapper.xml +++ b/src/main/resources/mapper/OrderMainMapper.xml @@ -43,8 +43,11 @@ and o.store_id = #{storeId} - - and o.order_status = #{orderStatus} + + and o.order_status in + + #{orderStatus} + order by o.update_time desc