From eb8a80f837834b172c531485070015be2965e8e8 Mon Sep 17 00:00:00 2001 From: dengwc Date: Wed, 24 Apr 2024 13:23:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=AB=E8=BD=A6=E7=BB=93=E7=AE=97=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order_record/LyOrderRecordExtensionFactory.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/chint/domain/factoriy/order_record/LyOrderRecordExtensionFactory.java b/src/main/java/com/chint/domain/factoriy/order_record/LyOrderRecordExtensionFactory.java index 0d804781..4c4bf3dc 100644 --- a/src/main/java/com/chint/domain/factoriy/order_record/LyOrderRecordExtensionFactory.java +++ b/src/main/java/com/chint/domain/factoriy/order_record/LyOrderRecordExtensionFactory.java @@ -385,12 +385,10 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor if (StringUtils.isBlank(orderTrainRecord.getOfflineCcomyCode()) && !Objects.isNull(routeOrder.getApproveOrderNo())) { orderTrainRecord.setOfflineCcomyCode(routeOrder.getApproveOrderNo().getCostCenter()); } + //结算状态 + orderTrainRecord.setOrderStatus(readOrderStatus(lyOrderTrainRecord.getOrderOperType())); //订单明细字段赋值 setTrainRecordDetail(orderTrainRecord, orderDetail.getTrainOrderDetail(), orderSerialNo); - //结算状态 - if (StringUtils.isBlank(orderTrainRecord.getOrderStatus())) { - orderTrainRecord.setOrderStatus(readOrderStatus(lyOrderTrainRecord.getOrderOperType()));//结算状态 - } //组织架构 setTrainOrganizational(orderTrainRecord, lyOrderTrainRecord); @@ -415,8 +413,10 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor .setFromStationName(Optional.ofNullable(orderTrainRecord.getFromStationName()) .orElse(trainOrderDetail.getFromStationName())) // 出发站 .setToStationName(Optional.ofNullable(orderTrainRecord.getToStationName()) - .orElse(trainOrderDetail.getToStationName())) // 到达站 - .setOrderStatus(trainOrderDetail.getOrderStatus());//结算状态 + .orElse(trainOrderDetail.getToStationName())); // 到达站 + if (StringUtils.isBlank(orderTrainRecord.getOrderStatus())) { + orderTrainRecord.setOrderStatus(trainOrderDetail.getOrderStatus());//结算状态 + } } else { LyOrderDetailTrainRecord lyOrderDetailTrainRecord = lyOrderDetailRecordFactory.queryTrainDetail(orderSerialNo); orderTrainRecord.setParentOrderNo(lyOrderDetailTrainRecord.getParentOrderNo())//父级订单号