1.修改打车车型数据赋值修改
This commit is contained in:
parent
b8688f7bca
commit
a3f03c19df
|
@ -123,11 +123,14 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
|
|||
carOrderDetail.setPaymentType("0");
|
||||
} else {
|
||||
carOrderDetail.setPaymentType("1");
|
||||
|
||||
}
|
||||
if (!carQuickOrderInfoEntity.getOrderFeeList().isEmpty()) {
|
||||
OrderFee orderFee = carQuickOrderInfoEntity.getOrderFeeList().get(0);
|
||||
if (orderFee.getFeeName().equals("取消费")) {
|
||||
carOrderDetail.setCancellationFee(orderFee.getAmount().toString());
|
||||
} else {
|
||||
|
||||
}
|
||||
}
|
||||
OrderProduct orderProduct = carQuickOrderInfoEntity.getOrderProduct();
|
||||
|
@ -142,7 +145,6 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
|
|||
carOrderDetail.setToStationName(arrAddress.getAddressDetail());
|
||||
carOrderDetail.setFromCity(depAddress.getCityName());
|
||||
carOrderDetail.setToCity(arrAddress.getCityName());
|
||||
// Driver driver = orderProduct.getDriver();
|
||||
Vehicle vehicle = orderProduct.getVehicle();
|
||||
carOrderDetail.setCarModel(vehicle.getVehicleName());
|
||||
}
|
||||
|
@ -301,6 +303,8 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
|
|||
}
|
||||
|
||||
if (flightInfo != null) {
|
||||
|
||||
|
||||
flightOrderDetail.setStartTime(flightInfo.getTakeoffTime());
|
||||
flightOrderDetail.setArriveTime(flightInfo.getArrivalTime());
|
||||
flightOrderDetail.setStartCityName(flightInfo.getDCityName());
|
||||
|
@ -337,6 +341,7 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
|
|||
}
|
||||
if (tripRecordInfo != null) {
|
||||
flightOrderDetail.setUserName(tripRecordInfo.getPassengerName());
|
||||
|
||||
flightOrderDetail.setStartTerminal(tripRecordInfo.getDPortBuilding());
|
||||
flightOrderDetail.setEndTerminal(tripRecordInfo.getAPortBuilding());
|
||||
flightOrderDetail.setTicketNo(tripRecordInfo.getTicketNo());
|
||||
|
@ -371,7 +376,6 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
|
|||
if (flightRefundInfo.getRefundDetail() != null && !flightRefundInfo.getRefundDetail().isEmpty()) {
|
||||
FlightRefundDetail refundDetail = flightRefundInfo.getRefundDetail().get(0);
|
||||
flightOrderDetail.setRefundFee(String.valueOf(refundDetail.getRefundFee()));
|
||||
flightOrderDetail.setRefundAmount(String.valueOf(flightRefundInfo.getPayCustomerAmount()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -681,13 +681,11 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
|
|||
String mileage = orderExtendInfo.getMileage();
|
||||
String mileageNumbers = mileage.replaceAll("\\D+", "");
|
||||
carOrderDetail.setMileage(mileageNumbers);
|
||||
carOrderDetail.setCarModel(orderExtendInfo.getCarTypeName());
|
||||
carOrderDetail.setCarModel(String.valueOf(orderExtendInfo.getCarTypeName()));
|
||||
}
|
||||
|
||||
|
||||
// if (orderDriverInfo != null) {
|
||||
// carOrderDetail.setCarModel(String.valueOf(orderDriverInfo.getCarType()));
|
||||
// }
|
||||
|
||||
List<CarDetailResponse.SubmitItem> submitItemList =
|
||||
data.getTravelDataInfo().getSubmitItemList();
|
||||
|
||||
|
|
Loading…
Reference in New Issue