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

已合并 PR 10101: 携程机票改签信息，增加对多条改签信息得判断 

携程机票改签信息，增加对多条改签信息得判断
This commit is contained in:
卢麟哲 2024-03-19 18:50:04 +08:00 committed by 蔡承余(Chengyu Cai)
parent 1dec2d6502 641a9d3954
commit 7b39c868e4
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,16 +310,20 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
flightOrderDetail.getOrderStatus().equals(FSSC_FLIGHT_STATUS_CHANGE)) {
String[] split = flightOrderDetail.getDetailId().split("-");
//要找出对应退票信息
ChangeInfo changeInfo = sequenceInfo
.getChangeInfo()
.stream()
.filter(it -> it.getRebookId().equals(Integer.parseInt(split[1])))
.toList().get(0);
flightOrderDetail.setUpFee(String.valueOf(changeInfo.getPriceDifferential()));
//如果是改签的，要加入改签费
flightOrderDetail.setChangeFee(String.valueOf(changeInfo.getRebookServiceFee()));
flightOrderDetail.setOrderAmount(String.valueOf(changeInfo.getCFee()));
flightOrderDetail.setCompanyPaymentAmount(String.valueOf(changeInfo.getCFee()));
if(split.length > 1){
ChangeInfo changeInfo = sequenceInfo
.getChangeInfo()
.stream()
.filter(it -> it.getRebookId().equals(Integer.parseInt(split[1])))
.toList().get(0);
flightOrderDetail.setUpFee(String.valueOf(changeInfo.getPriceDifferential()));
//如果是改签的，要加入改签费
flightOrderDetail.setChangeFee(String.valueOf(changeInfo.getRebookServiceFee()));
flightOrderDetail.setOrderAmount(String.valueOf(changeInfo.getCFee()));
flightOrderDetail.setCompanyPaymentAmount(String.valueOf(changeInfo.getCFee()));
} else {
flightOrderDetail.setOrderStatus(FSSC_FLIGHT_STATUS_SUCCESS);
}
}
}
PassengerBasic passengerBasic = passengerInfo.getPassengerBasic();

2
src/main/java/com/chint/domain/service/OrderDomainService.java
View File

@ -463,7 +463,7 @@ public class OrderDomainService {
List<FlightRefundInfo> refundInfo = flightOrderInfoEntity.getRefundInfo();
if (refundInfo != null && !refundInfo.isEmpty()) {
for (FlightRefundInfo flightRefundInfo : refundInfo) {
if ("D".equals(flightRefundInfo.getRefundStatus())) {
if ("D".equals(flightRefundInfo.getRefundStatus()) || "S".equals(flightRefundInfo.getRefundStatus())) {
Command.of(RefundOrderGenerateCommand.class).Info(
String.valueOf(flightRefundInfo.getRefundOrderID()),
flightOrderInfoEntity.getBasicInfo().getOrderID(),