From 6272b47af938e2acbe6d4d279f9c14ad953aba32 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 28 Sep 2022 00:24:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9F=A5=E8=AF=A2=E5=8D=95=E6=8D=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92=E6=8E=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/udi/admin/service/inout/OrderService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java b/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java index 527a44e..c3b919c 100644 --- a/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java +++ b/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java @@ -102,7 +102,7 @@ public class OrderService { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StrUtil.isNotBlank(orderFilterRequest.getId()), "orderId", orderFilterRequest.getId()) .or(StrUtil.isNotBlank(orderFilterRequest.getId())) - .eq(StrUtil.isNotBlank(orderFilterRequest.getId()),"corpOrderId", orderFilterRequest.getId()) + .eq(StrUtil.isNotBlank(orderFilterRequest.getId()), "corpOrderId", orderFilterRequest.getId()) .in(CollUtil.isNotEmpty(orderFilterRequest.getInvCodes()), "locStorageCode", orderFilterRequest.getInvCodes()) .ge(StrUtil.isNotBlank(orderFilterRequest.getStartTime()), "actDate", orderFilterRequest.getStartTime()) .le(StrUtil.isNotBlank(orderFilterRequest.getEndTime()), "actDate", orderFilterRequest.getEndTime()) @@ -116,7 +116,8 @@ public class OrderService { .eq(null != orderFilterRequest.getCustomerId(), "customerId", orderFilterRequest.getCustomerId()) .eq(StrUtil.isNotBlank(orderFilterRequest.getCorpOrderId()), "corpOrderId", orderFilterRequest.getCorpOrderId()) .eq(null != orderFilterRequest.getReceiveStatus(), "receiveStatus", orderFilterRequest.getReceiveStatus()) - .ne(null == orderFilterRequest.getReceiveStatus() && ConstantStatus.ORDER_STATUS_SUCCESS.equals(orderFilterRequest.getStatus()), "receiveStatus", ConstantStatus.RECEIVE_UN); + .ne(null == orderFilterRequest.getReceiveStatus() && ConstantStatus.ORDER_STATUS_SUCCESS.equals(orderFilterRequest.getStatus()), "receiveStatus", ConstantStatus.RECEIVE_UN) + .orderByDesc("actDate"); return wrapper; }