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 14:19:44 +08:00
parent fcd162d4cb
commit 3e20ea6597
2 changed files with 0 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,12 +210,9 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
if (approveOrderNo != null) {
flightOrderDetail.setAccountCompanyId(approveOrderNo.getAccountCompany());
flightOrderDetail.setAccountCompanyName(approveOrderNo.getAccountCompanyName());
// flightOrderDetail.setReceiptsNum(journeyNo);
flightOrderDetail.setReceiptsNum(routeOrder.getRouteOrderNo());
flightOrderDetail.setCostCenter(approveOrderNo.getCostCenter());
flightOrderDetail.setProjectOrderNo(approveOrderNo.getProjectName());
}
// first.flatMap(orderDetail -> routeOrder.getLegItems()
@ -356,10 +353,6 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
hotelOrderDetail.setDetailId(hotelOrderInfoEntity.getOrderID());
// hotelOrderDetail.setReceiptsNum(hotelOrderInfoEntity.getJourneyNo());
hotelOrderDetail.setReceiptsNum(routeOrder.getRouteOrderNo());
hotelOrderDetail.setCreateTime(hotelOrderInfoEntity.getOrderDate());

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

@ -214,10 +214,6 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
}
flightOrderDetail.setReceiptsNum(routeOrder.getRouteOrderNo());
if (travelData != null) {
// flightOrderDetail.setReceiptsNum(travelData.getTravelApplyNo());
}
if (passenger != null) {
flightOrderDetail.setFuelTax(passenger.getFuelTax().toString());
@ -233,20 +229,6 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
flightOrderDetail.setInsuranceFee(passenger.getInsurancePrice().toString());
}
List<FlightOrderResponse.SubmitItem> submitItemList =
data.getTravelData().getSubmitItemList();
if (submitItemList != null && !submitItemList.isEmpty()) {
for (FlightOrderResponse.SubmitItem submitItem : submitItemList) {
String itemCode = submitItem.getItemCode();
if (itemCode.equals("CostCenter")) {
flightOrderDetail.setCostCenter(submitItem.getItemContent());
}
if (itemCode.equals("Custom3")) {
flightOrderDetail.setProjectOrderNo(submitItem.getItemContent());
}
}
}
// flightOrderDetail.setBookingUserPhone(data.get); //无
// flightOrderDetail.setEndCityCode(flightSegment.getarrivecit()); //无
@ -314,13 +296,10 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
User user = userRepository.findByUserEmployeeNo(EmployeeNo);
if (orderInfo != null) {
hotelOrderDetail.setOrderNo(orderInfo.getOrderSerialNo())
.setDetailId(orderInfo.getOrderSerialNo())
// .setSupplier(SUPPLIER_L_Y_EXTENSION_NAME)
.setOverStandard(String.valueOf(orderInfo.getRuleViolate()))
// .setReceiptsNum(orderInfo.getTravelApplyNo())
.setReceiptsNum(routeOrder.getRouteOrderNo())
.setOrderAmount(String.valueOf(orderInfo.getBusinessAmount()))
.setCreateTime(orderInfo.getCreateTime())
@ -368,23 +347,6 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
hotelOrderDetail.setProjectOrderNo(approveOrderNo.getProjectName());
}
List<FlightOrderResponse.SubmitItem> submitItemList =
data.getTravelData().getSubmitItemList();
if (submitItemList != null && !submitItemList.isEmpty()) {
for (FlightOrderResponse.SubmitItem submitItem : submitItemList) {
String itemCode = submitItem.getItemCode();
if (itemCode.equals("CostCenter")) {
hotelOrderDetail.setCostCenter(submitItem.getItemContent());
}
if (itemCode.equals("Custom3")) {
hotelOrderDetail.setProjectOrderNo(submitItem.getItemContent());
}
}
}
Optional<OrderDetail> first1 = routeOrder
.getOrderDetails()
@ -493,10 +455,7 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
trainOrderDetail.setBookingName(user.getName());
trainOrderDetail.setBookingUserPhone(user.getPhoneNumber());
}
// trainOrderDetail.setReceiptsNum(trainDetailData.getTravelData().getTravelApplyNo());
trainOrderDetail.setReceiptsNum(routeOrder.getRouteOrderNo());
trainOrderDetail.setCreateTime(trainDetailData.getOutTicketTime());
trainOrderDetail.setStartTime(trainDetailData.getPlanBeginDate());
trainOrderDetail.setArriveTime(trainDetailData.getPlanEndDate());
@ -520,20 +479,7 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
trainOrderDetail.setCostCenter(approveOrderNo.getCostCenter());
trainOrderDetail.setProjectOrderNo(approveOrderNo.getProjectName());
}
if (submitItemList != null && !submitItemList.isEmpty()) {
for (TrainDetailResponse.TravelData.SubmitItem submitItem : submitItemList) {
String itemCode = submitItem.getItemCode();
if (itemCode.equals("CostCenter")) {
trainOrderDetail.setCostCenter(submitItem.getItemContent());
}
if (itemCode.equals("Custom3")) {
trainOrderDetail.setProjectOrderNo(submitItem.getItemContent());
}
}
}
}
if (item != null) {
@ -583,15 +529,11 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
}
private CarOrderDetail convertCarOrderDetail(CarDetailResponse.DataWrapper data) {
// CarDetailResponse.Data data = carDetailResponse.getData();
// CarDetailResponse.DataWrapper data = carDetailResponse.getData();
CarDetailResponse.CarOrderDetailInfo carOrderDetailInfo = data.getCarOrderDetailInfo();
CarDetailResponse.TravelDataInfo travelDataInfo = data.getTravelDataInfo();
CarDetailResponse.OrderExtendInfo orderExtendInfo = data.getOrderExtendInfo();
CarOrderDetail carOrderDetail = new CarOrderDetail();
// carOrderDetail.setSupplier(SUPPLIER_L_Y_EXTENSION_NAME);
RouteOrder routeOrder = null;
if (carOrderDetailInfo != null) {
OrderDetail orderDetail = orderDetailRepository.findByOrderNo(carOrderDetailInfo.getOrderSerialNo())
@ -606,11 +548,9 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
}
if (sysCode.equals("H3BPM")) {
carOrderDetail.setBelongSysType("JT_BPM");
}
if (sysCode.equals("XNFSSC")) {
carOrderDetail.setBelongSysType("XN_FK");
}
if (sysCode.equals("ANFSSC")) {
carOrderDetail.setBelongSysType("AN_FK");
@ -618,7 +558,6 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
}
carOrderDetail.setOrderNo(carOrderDetailInfo.getOrderSerialNo());
carOrderDetail.setDetailId(carOrderDetailInfo.getOrderSerialNo());
Optional<OrderDetail> first1 = routeOrder
.getOrderDetails()
.stream()
@ -647,16 +586,10 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
carOrderDetail.setPersonalPaymentAmount(String.valueOf(carOrderDetailInfo.getPersonalPrice()));
carOrderDetail.setCompanyPaymentAmount(String.valueOf(carOrderDetailInfo.getCompanyPrice()));
carOrderDetail.setPaymentType(String.valueOf(carOrderDetailInfo.getPayType())); //无
}
carOrderDetail.setReceiptsNum(routeOrder.getRouteOrderNo());
// if (travelDataInfo != null) {
// carOrderDetail.setReceiptsNum(travelDataInfo.getTravelApplyNo());
//
// }
if (orderExtendInfo != null) {
carOrderDetail.setStartTime(orderExtendInfo.getChargeTime());
carOrderDetail.setArriveTime(orderExtendInfo.getFinishTime());
@ -681,19 +614,6 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
// if (submitItemList != null && !submitItemList.isEmpty()) {
// for (CarDetailResponse.SubmitItem submitItem : submitItemList) {
// String itemCode = submitItem.getItemCode();
//
// if (itemCode.equals("CostCenter")) {
// carOrderDetail.setCostCenter(submitItem.getItemContent());
// }
//
// if (itemCode.equals("Custom3")) {
// carOrderDetail.setProjectOrderNo(submitItem.getItemContent());
// }
// }
// }
// carOrderDetail.setOverStandard(); //无