From 4988e314fb82b1cd6c58367fe11a619f75e1b49d Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 21 Jul 2023 11:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8D=95=E6=8D=AE=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=97=B6=E9=97=B4=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/service/inout/IoCheckInoutService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 60ffdfd72..e38f1651c 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -813,7 +813,8 @@ public class IoCheckInoutService { if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) { orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_REW); orderEntity.setUpdateTime(new Date()); - orderEntity.setCheckTime(new Date()); + if (IntUtil.value(orderEntity.getFromType()) != ConstantStatus.FROM_UDISP) + orderEntity.setCheckTime(new Date()); orderService.update(orderEntity); checkSecond(orderEntity); } @@ -870,7 +871,8 @@ public class IoCheckInoutService { if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) { orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_CHECK); orderEntity.setUpdateTime(new Date()); - orderEntity.setAuditTime(new Date()); + if (IntUtil.value(orderEntity.getFromType()) != ConstantStatus.FROM_UDISP) + orderEntity.setAuditTime(new Date()); if (StrUtil.isEmpty(orderEntity.getReviewUser())) { orderEntity.setReviewUser(orderEntity.getReviewUser()); }