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

修复财务共享拉取不到飞机数据的问题

This commit is contained in:
lulz1 2024-03-18 21:19:40 +08:00
parent 0f4b7bc6f1
commit 3cad10498d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,9 +40,6 @@ public class OrderDetailQuery {
private RouteRepository routeRepository;
// public Result<PageResult<Object>> orderDetailInfoPageQuery(AuthenticationSignDto authenticationDto) {
// Integer productType = authenticationDto.getProductType();
// String systemType = authenticationDto.getSystemType();
@ -145,6 +142,7 @@ public class OrderDetailQuery {
private Object processHotelOrderDetail(OrderDetail orderDetail, String systemType) {
HotelOrderDetail hotelOrderDetail = orderDetail.getHotelOrderDetail();
if (hotelOrderDetail != null &&
hotelOrderDetail.getOrderStatus() != null &&
!hotelOrderDetail.getOrderStatus().equals(FSSC_ORDER_STATUS_CANCEL) &&
systemType.equals(hotelOrderDetail.getBelongSysType())) {
String receiptsNum = hotelOrderDetail.getReceiptsNum();
@ -168,6 +166,7 @@ public class OrderDetailQuery {
private Object processTrainOrderDetail(OrderDetail orderDetail, String systemType) {
TrainOrderDetail trainOrderDetail = orderDetail.getTrainOrderDetail();
if (trainOrderDetail != null &&
trainOrderDetail.getOrderStatus() != null &&
!trainOrderDetail.getOrderStatus().equals(FSSC_ORDER_STATUS_CANCEL) &&
systemType.equals(trainOrderDetail.getBelongSysType())) {
String receiptsNum = trainOrderDetail.getReceiptsNum();
@ -186,6 +185,7 @@ public class OrderDetailQuery {
private Object processCarOrderDetail(OrderDetail orderDetail, String systemType) {
CarOrderDetail carOrderDetail = orderDetail.getCarOrderDetail();
if (carOrderDetail != null &&
carOrderDetail.getOrderStatus() != null &&
!carOrderDetail.getOrderStatus().equals(FSSC_ORDER_STATUS_CANCEL) &&
systemType.equals(carOrderDetail.getBelongSysType())) {
String receiptsNum = carOrderDetail.getReceiptsNum();
@ -205,6 +205,7 @@ public class OrderDetailQuery {
FlightOrderDetail flightOrderDetail = orderDetail.getFlightOrderDetail();
if (flightOrderDetail != null &&
flightOrderDetail.getOrderStatus() != null &&
!flightOrderDetail.getOrderStatus().equals(FSSC_ORDER_STATUS_CANCEL) &&
systemType.equals(flightOrderDetail.getBelongSysType())) {
String receiptsNum = flightOrderDetail.getReceiptsNum();
@ -214,12 +215,12 @@ public class OrderDetailQuery {
FlightOrderDetailDto orderDetailDto = FlightOrderDetailDto.copyFrom(flightOrderDetail);
String ticketNo = orderDetailDto.getTicketNo();
if (ticketNo.contains("-") && ticketNo != null) {
if (ticketNo != null && ticketNo.contains("-")) {
ticketNo = ticketNo.replace("-", "");
orderDetailDto.setTicketNo(ticketNo);
}
String changedTicketNo = orderDetailDto.getChangedTicketNo();
if (changedTicketNo.contains("-") && changedTicketNo != null) {
if (changedTicketNo != null && changedTicketNo.contains("-")) {
changedTicketNo = changedTicketNo.replace("-", "");
orderDetailDto.setChangedTicketNo(changedTicketNo);
}
@ -262,8 +263,7 @@ public class OrderDetailQuery {
private String regetReceiptsNum(String receiptsNum) {
if (receiptsNum.contains("-")) {
String[] parts = receiptsNum.split("-");
String result = parts[1];
return result;
return parts[1];
} else {
return receiptsNum;
}