echo
/
route
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
lulz1 2024-04-24 14:48:07 +08:00
parent 1cf110095b eb8a80f837
commit 437c43d0eb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/chint/domain/factoriy/order_record/LyOrderRecordExtensionFactory.java
View File

@ -385,12 +385,10 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
if (StringUtils.isBlank(orderTrainRecord.getOfflineCcomyCode()) && !Objects.isNull(routeOrder.getApproveOrderNo())) { if (StringUtils.isBlank(orderTrainRecord.getOfflineCcomyCode()) && !Objects.isNull(routeOrder.getApproveOrderNo())) {
orderTrainRecord.setOfflineCcomyCode(routeOrder.getApproveOrderNo().getCostCenter()); orderTrainRecord.setOfflineCcomyCode(routeOrder.getApproveOrderNo().getCostCenter());
} }
//结算状态
orderTrainRecord.setOrderStatus(readOrderStatus(lyOrderTrainRecord.getOrderOperType()));
//订单明细字段赋值 //订单明细字段赋值
setTrainRecordDetail(orderTrainRecord, orderDetail.getTrainOrderDetail(), orderSerialNo); setTrainRecordDetail(orderTrainRecord, orderDetail.getTrainOrderDetail(), orderSerialNo);
//结算状态
if (StringUtils.isBlank(orderTrainRecord.getOrderStatus())) {
orderTrainRecord.setOrderStatus(readOrderStatus(lyOrderTrainRecord.getOrderOperType()));//结算状态
}
//组织架构 //组织架构
setTrainOrganizational(orderTrainRecord, lyOrderTrainRecord); setTrainOrganizational(orderTrainRecord, lyOrderTrainRecord);
@ -415,8 +413,10 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
.setFromStationName(Optional.ofNullable(orderTrainRecord.getFromStationName()) .setFromStationName(Optional.ofNullable(orderTrainRecord.getFromStationName())
.orElse(trainOrderDetail.getFromStationName())) // 出发站 .orElse(trainOrderDetail.getFromStationName())) // 出发站
.setToStationName(Optional.ofNullable(orderTrainRecord.getToStationName()) .setToStationName(Optional.ofNullable(orderTrainRecord.getToStationName())
.orElse(trainOrderDetail.getToStationName())) // 到达站 .orElse(trainOrderDetail.getToStationName())); // 到达站
.setOrderStatus(trainOrderDetail.getOrderStatus());//结算状态 if (StringUtils.isBlank(orderTrainRecord.getOrderStatus())) {
orderTrainRecord.setOrderStatus(trainOrderDetail.getOrderStatus());//结算状态
}
} else { } else {
LyOrderDetailTrainRecord lyOrderDetailTrainRecord = lyOrderDetailRecordFactory.queryTrainDetail(orderSerialNo); LyOrderDetailTrainRecord lyOrderDetailTrainRecord = lyOrderDetailRecordFactory.queryTrainDetail(orderSerialNo);
orderTrainRecord.setParentOrderNo(lyOrderDetailTrainRecord.getParentOrderNo())//父级订单号 orderTrainRecord.setParentOrderNo(lyOrderDetailTrainRecord.getParentOrderNo())//父级订单号