From 07134dc9201670c8805c92bb70c5b31296ca7aaf Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Wed, 30 Jul 2025 23:04:45 +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=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sczx/order/service/impl/OrderServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 30171ee..2561583 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -233,11 +233,13 @@ public class OrderServiceImpl implements OrderService { @Override public IPage pageCustOrder(Integer pageNo, Integer pageSize, OrderQueryReq orderQueryReq) { orderQueryReq.setCustomerId(Long.valueOf(jwtUtil.getUserInfoFromToken().getUserId().toString())); - return orderMainRepo.pageQueryOrder(pageNo, pageSize, orderQueryReq.getCustomerId(), orderQueryReq.getStoreId(), orderQueryReq.getOrderStatus().getCode()); + String orderStatusCode = orderQueryReq.getOrderStatus() == null ? null : orderQueryReq.getOrderStatus().getCode(); + return orderMainRepo.pageQueryOrder(pageNo, pageSize, orderQueryReq.getCustomerId(), orderQueryReq.getStoreId(), orderStatusCode); } @Override - public IPage pageStoreOrder(Integer pageNo, Integer pageSize, OrderQueryReq storeOrderQueryReq) { - return orderMainRepo.pageQueryOrder(pageNo, pageSize, storeOrderQueryReq.getCustomerId(), storeOrderQueryReq.getStoreId(), storeOrderQueryReq.getOrderStatus().getCode()); + 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); } }