火车结算状态调整
This commit is contained in:
parent
bfa2e83a6d
commit
eb8a80f837
|
@ -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())//父级订单号
|
||||
|
|
Loading…
Reference in New Issue