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())//父级订单号