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

1.修改订单明细认证接口

This commit is contained in:
wanglf3 2024-03-13 11:09:02 +08:00
parent 7217d255c3
commit d5b0be42f9
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,6 +97,7 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
String orderNo = flightOrderBasicInfo.getOrderID();
String journeyNo = flightOrderBasicInfo.getJourneyID();
RouteOrder routeOrder = routeRepository.findByOrderNo(journeyNo);
String sysCode = routeOrder.getApproveOrderNo().getSysCode();
@ -208,7 +209,9 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
if (approveOrderNo != null) {
flightOrderDetail.setAccountCompanyId(approveOrderNo.getAccountCompany());
flightOrderDetail.setAccountCompanyName(approveOrderNo.getAccountCompanyName());
flightOrderDetail.setReceiptsNum(journeyNo);
// flightOrderDetail.setReceiptsNum(journeyNo);
flightOrderDetail.setReceiptsNum(routeOrder.getRouteOrderNo());
}
// first.flatMap(orderDetail -> routeOrder.getLegItems()
@ -346,7 +349,9 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
hotelOrderDetail.setOrderNo(hotelOrderInfoEntity.getOrderID()); //订单号
hotelOrderDetail.setDetailId(hotelOrderInfoEntity.getOrderID());
hotelOrderDetail.setPaymentType(hotelOrderInfoEntity.getPayType());
hotelOrderDetail.setReceiptsNum(hotelOrderInfoEntity.getJourneyNo());
// hotelOrderDetail.setReceiptsNum(hotelOrderInfoEntity.getJourneyNo());
hotelOrderDetail.setReceiptsNum(routeOrder.getRouteOrderNo());
hotelOrderDetail.setCreateTime(hotelOrderInfoEntity.getOrderDate());
hotelOrderDetail.setCheckInCity(hotelOrderInfoEntity.getCityName());
hotelOrderDetail.setHotelName(hotelOrderInfoEntity.getHotelName());

26
src/main/java/com/chint/domain/factoriy/order_detail/LYOrderExtensionFactoryImpl.java
View File

@ -217,8 +217,9 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
}
flightOrderDetail.setReceiptsNum(routeOrder.getRouteOrderNo());
if (travelData != null) {
flightOrderDetail.setReceiptsNum(travelData.getTravelApplyNo());
// flightOrderDetail.setReceiptsNum(travelData.getTravelApplyNo());
}
@ -316,9 +317,11 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
if (orderInfo != null) {
hotelOrderDetail.setOrderNo(orderInfo.getOrderSerialNo())
.setDetailId(orderInfo.getOrderSerialNo())
.setSupplier(SUPPLIER_L_Y_EXTENSION_NAME)
// .setSupplier(SUPPLIER_L_Y_EXTENSION_NAME)
.setOverStandard(String.valueOf(orderInfo.getRuleViolate()))
.setReceiptsNum(orderInfo.getTravelApplyNo())
// .setReceiptsNum(orderInfo.getTravelApplyNo())
.setReceiptsNum(routeOrder.getRouteOrderNo())
.setBookingUserCode(orderInfo.getOutEmployeeId())
.setOrderAmount(String.valueOf(orderInfo.getBusinessAmount()))
.setCreateTime(orderInfo.getCreateTime())
@ -478,7 +481,9 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
);
trainOrderDetail.setReceiptsNum(trainDetailData.getTravelData().getTravelApplyNo());
// trainOrderDetail.setReceiptsNum(trainDetailData.getTravelData().getTravelApplyNo());
trainOrderDetail.setReceiptsNum(routeOrder.getRouteOrderNo());
trainOrderDetail.setBookingUserCode(trainDetailData.getOutEmployeeId());
trainOrderDetail.setCreateTime(trainDetailData.getOutTicketTime());
trainOrderDetail.setStartTime(trainDetailData.getPlanBeginDate());
@ -536,7 +541,7 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
trainOrderDetail.setChangeDifference(String.valueOf(changeItem.getChangePrice()));
}
trainOrderDetail.setSupplier(SUPPLIER_L_Y_EXTENSION_NAME);
// trainOrderDetail.setSupplier(SUPPLIER_L_Y_EXTENSION_NAME);
if (first.isEmpty()) {
trainOrderDetail.setOverStandard("否"); //无
} else {
@ -573,7 +578,7 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
CarDetailResponse.OrderExtendInfo orderExtendInfo = data.getOrderExtendInfo();
CarOrderDetail carOrderDetail = new CarOrderDetail();
carOrderDetail.setSupplier(SUPPLIER_L_Y_EXTENSION_NAME);
// carOrderDetail.setSupplier(SUPPLIER_L_Y_EXTENSION_NAME);
RouteOrder routeOrder = null;
if (carOrderDetailInfo != null) {
OrderDetail orderDetail = orderDetailRepository.findByOrderNo(carOrderDetailInfo.getOrderSerialNo())
@ -625,10 +630,13 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
}
if (travelDataInfo != null) {
carOrderDetail.setReceiptsNum(travelDataInfo.getTravelApplyNo());
}
carOrderDetail.setReceiptsNum(routeOrder.getRouteOrderNo());
// if (travelDataInfo != null) {
// carOrderDetail.setReceiptsNum(travelDataInfo.getTravelApplyNo());
//
// }
if (orderExtendInfo != null) {
carOrderDetail.setStartTime(orderExtendInfo.getChargeTime());
carOrderDetail.setArriveTime(orderExtendInfo.getFinishTime());