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

1.修改 applicantId 的赋值 

2.修改携程打车支付金额的赋值
This commit is contained in:
wanglf3 2024-03-18 15:07:58 +08:00
parent 3983b31857
commit 8115bafef7
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,13 +163,10 @@ public class OrderDetailQuery {
Double.parseDouble(hotelOrderDetail.getOrderAmount()) == 0) {
return null;
}
HotelOrderDetailDto orderDetailDto = HotelOrderDetailDto.copyFrom(hotelOrderDetail);
RouteOrder routeOrder = routeRepository.queryById(orderDetail.getRouteId());
orderDetailDto.setApplicantId(routeOrder.getCreateUser());
ApproveOrderNo approveOrderNo = routeOrder.getApproveOrderNo();
orderDetailDto.setApplicantId(approveOrderNo.getCreator());
return orderDetailDto;
}
return null;
@ -184,13 +181,10 @@ public class OrderDetailQuery {
if (receiptsNum != null) {
trainOrderDetail.setReceiptsNum(regetReceiptsNum(receiptsNum));
}
TrainOrderDetailDto orderDetailDto = TrainOrderDetailDto.copyFrom(trainOrderDetail);
RouteOrder routeOrder = routeRepository.queryById(orderDetail.getRouteId());
orderDetailDto.setApplicantId(routeOrder.getCreateUser());
ApproveOrderNo approveOrderNo = routeOrder.getApproveOrderNo();
orderDetailDto.setApplicantId(approveOrderNo.getCreator());
return orderDetailDto;
}
return null;
@ -205,13 +199,10 @@ public class OrderDetailQuery {
if (receiptsNum != null) {
carOrderDetail.setReceiptsNum(regetReceiptsNum(receiptsNum));
}
CarOrderDetailDto orderDetailDto = CarOrderDetailDto.copyFrom(carOrderDetail);
RouteOrder routeOrder = routeRepository.queryById(orderDetail.getRouteId());
orderDetailDto.setApplicantId(routeOrder.getCreateUser());
ApproveOrderNo approveOrderNo = routeOrder.getApproveOrderNo();
orderDetailDto.setApplicantId(approveOrderNo.getCreator());
return orderDetailDto;
}
return null;
@ -227,13 +218,10 @@ public class OrderDetailQuery {
if (receiptsNum != null) {
flightOrderDetail.setReceiptsNum(regetReceiptsNum(receiptsNum));
}
FlightOrderDetailDto orderDetailDto = FlightOrderDetailDto.copyFrom(flightOrderDetail);
RouteOrder routeOrder = routeRepository.queryById(orderDetail.getRouteId());
orderDetailDto.setApplicantId(routeOrder.getCreateUser());
ApproveOrderNo approveOrderNo = routeOrder.getApproveOrderNo();
orderDetailDto.setApplicantId(approveOrderNo.getCreator());
return orderDetailDto;
}
return null;

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

@ -125,9 +125,9 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
carOrderDetail.setPaymentType("1");
}
carOrderDetail.setCompanyPaymentAmount(String.valueOf(carBasicInfo.getPersonAmount()));
carOrderDetail.setCompanyPaymentAmount(String.valueOf(carBasicInfo.getAccntAmount()));
carOrderDetail.setPersonalPaymentAmount(String.valueOf(carBasicInfo.getAccntAmount()));
carOrderDetail.setPersonalPaymentAmount(String.valueOf(carBasicInfo.getPersonAmount()));
if (!carQuickOrderInfoEntity.getOrderFeeList().isEmpty()) {
OrderFee orderFee = carQuickOrderInfoEntity.getOrderFeeList().get(0);