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

1.修改 飞机票号和改签票号 删除 - 符号

This commit is contained in:
wanglf3 2024-03-18 16:11:48 +08:00
parent fc63541b9c
commit 38f54b1235
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/chint/application/queryies/OrderDetailQuery.java
View File

@ -219,6 +219,17 @@ public class OrderDetailQuery {
flightOrderDetail.setReceiptsNum(regetReceiptsNum(receiptsNum));
}
FlightOrderDetailDto orderDetailDto = FlightOrderDetailDto.copyFrom(flightOrderDetail);
String ticketNo = orderDetailDto.getTicketNo();
if (ticketNo.contains("-") && ticketNo != null) {
ticketNo = ticketNo.replace("-", "");
orderDetailDto.setTicketNo(ticketNo);
}
String changedTicketNo = orderDetailDto.getChangedTicketNo();
if (changedTicketNo.contains("-") && changedTicketNo != null) {
changedTicketNo = changedTicketNo.replace("-", "");
orderDetailDto.setChangedTicketNo(changedTicketNo);
}
RouteOrder routeOrder = routeRepository.queryById(orderDetail.getRouteId());
ApproveOrderNo approveOrderNo = routeOrder.getApproveOrderNo();
orderDetailDto.setApplicantId(approveOrderNo.getCreator());

23
src/main/java/com/chint/domain/factoriy/order_detail/CTripOrderExtensionFactoryImpl.java
View File

@ -117,54 +117,37 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
carOrderDetail.setReceiptsNum(routeOrder.getRouteOrderNo());
carOrderDetail.setCreateTime(carBasicInfo.getCreateTime());
carOrderDetail.setOrderAmount(String.valueOf(carBasicInfo.getOrderAmount()));
carOrderDetail.setCompanyPaymentAmount(String.valueOf(carBasicInfo.getAccntAmount()));
carOrderDetail.setPersonalPaymentAmount(String.valueOf(carBasicInfo.getPersonAmount()));
if (carBasicInfo.getPaymentType().equals("ACCNT")) {
carOrderDetail.setPaymentType("0");
} else {
carOrderDetail.setPaymentType("1");
}
carOrderDetail.setCompanyPaymentAmount(String.valueOf(carBasicInfo.getAccntAmount()));
carOrderDetail.setPersonalPaymentAmount(String.valueOf(carBasicInfo.getPersonAmount()));
if (!carQuickOrderInfoEntity.getOrderFeeList().isEmpty()) {
OrderFee orderFee = carQuickOrderInfoEntity.getOrderFeeList().get(0);
if (orderFee.getFeeName().equals("取消费")) {
carOrderDetail.setCancellationFee(orderFee.getAmount().toString());
} else {
}
}
OrderProduct orderProduct = carQuickOrderInfoEntity.getOrderProduct();
if (orderProduct != null) {
carOrderDetail.setStartTime(orderProduct.getServiceBeginTime());
carOrderDetail.setArriveTime(orderProduct.getServiceEndTime());
carOrderDetail.setMileage(orderProduct.getNormalDistance());
carOrderDetail.setRunTime(orderProduct.getNormalTime());
Address depAddress = orderProduct.getDepartAddress();
Address arrAddress = orderProduct.getArriveAddress();
carOrderDetail.setFromStationName(depAddress.getAddressDetail());
carOrderDetail.setToStationName(arrAddress.getAddressDetail());
carOrderDetail.setFromCity(depAddress.getCityName());
carOrderDetail.setToCity(arrAddress.getCityName());
Driver driver = orderProduct.getDriver();
carOrderDetail.setCarModel(driver.getDriverVehicleName());
}
ApproveOrderNo approveOrderNo = routeOrder.getApproveOrderNo();
if (approveOrderNo != null) {
carOrderDetail.setAccountCompanyId(approveOrderNo.getAccountCompanyCode());
@ -173,7 +156,6 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
carOrderDetail.setCostCenter(approveOrderNo.getCostCenter());
carOrderDetail.setProjectOrderNo(approveOrderNo.getProjectName());
}
OrderDetail orderDetail = orderDetailRepository.findByOrderNo(carBasicInfo.getOrderId())
.orElseThrow(() -> new NotFoundException(NOT_FOUND));
Optional<Integer> firstOrderEvent = orderDetail.getOrderEventList()
@ -187,7 +169,6 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
} else {
carOrderDetail.setOverStandard("是"); //无
}
Optional<OrderEvent> first1 = orderDetail.getOrderEventList()
.stream()
.findFirst();