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

1.修改 添加 超标原因字段

This commit is contained in:
wanglf3 2024-03-14 20:47:05 +08:00
parent a321c011c4
commit 0fdb3fef39
3 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,6 +178,13 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
carOrderDetail.setOverStandard("是"); //无
}
Optional<OrderEvent> first1 = orderDetail.getOrderEventList()
.stream()
.findFirst();
if (first1 != null){
carOrderDetail.setOverStandardReason(first1.get().getExtension());
}
// derDetail.setTollFee(tollFee);// 无
return carOrderDetail;
@ -384,7 +391,12 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
flightOrderDetail.setOverStandard("是"); //无
}
// flightOrderDetail.setOverStandardReason(flightInfo.getClassReasonDesc());
Optional<OrderEvent> first1 = orderDetail.getOrderEventList()
.stream()
.findFirst();
if (first1 != null){
flightOrderDetail.setOverStandardReason(first1.get().getExtension());
}
// flightOrderDetail.setPostServiceFee();
// flightOrderDetail.setParentOrderNo();
@ -552,7 +564,13 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
} else {
hotelOrderDetail.setOverStandard("是"); //无
}
hotelOrderDetail.setOverStandardReason(hotelOrderInfoEntity.getLowPriceRCInfo());
Optional<OrderEvent> first1 = orderDetail.getOrderEventList()
.stream()
.findFirst();
if (first1 != null){
hotelOrderDetail.setOverStandardReason(first1.get().getExtension());
}
return hotelOrderDetail;
}

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

@ -209,7 +209,12 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
} else {
flightOrderDetail.setOverStandard("是"); //无
}
// flightOrderDetail.setOverStandardReason(orderDetails.getFoulReason());
Optional<OrderEvent> first1 = orderDetail.getOrderEventList()
.stream()
.findFirst();
if (first1 != null){
flightOrderDetail.setOverStandardReason(first1.get().getExtension());
}
// flightOrderDetail.setBookingUserPhone(data.get); //无
@ -290,7 +295,6 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
.setPreServiceFee(String.valueOf(orderInfo.getServicePrice()))
.setPostServiceFee(String.valueOf(orderInfo.getAfterSettlementServicePrice()))
.setRefundAmount(String.valueOf(orderInfo.getRefundPrice()))
.setOverStandardReason(orderInfo.getFoulReason())
.setAgreementHotel(orderInfo.getProtocolType()==0?"否":"是");
// .setBookingName(orderInfo.getContactName()) //预订人名字和电话使用contact是否正确
// .setBookingUserPhone(orderInfo.getContactPhone())
@ -339,7 +343,12 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
} else {
hotelOrderDetail.setOverStandard("是"); //无
}
// flightOrderDetail.setOverStandardReason(orderDetails.getFoulReason());
Optional<OrderEvent> first2 = orderDetail.getOrderEventList()
.stream()
.findFirst();
if (first2 != null){
hotelOrderDetail.setOverStandardReason(first2.get().getExtension());
}
List<Resident> residentList = data.getResidentList();
if (residentList != null && !residentList.isEmpty()) {
@ -515,7 +524,12 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
trainOrderDetail.setOverStandard("是"); //无
}
trainOrderDetail.setOverStandardReason(""); //无
Optional<OrderEvent> first2 = orderDetail.getOrderEventList()
.stream()
.findFirst();
if (first2 != null){
trainOrderDetail.setOverStandardReason(first2.get().getExtension());
}
// trainOrderDetail.setOriginalOrderNo("originalOrderNo"); //无
// trainOrderDetail.setBookingUserPhone(trainDetailData.getContactInfo().getPersonMobile() != null ?
@ -579,8 +593,6 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
}}
);
String EmployeeNo = routeOrder.getUserId();
User user = userRepository.findByUserEmployeeNo(EmployeeNo);
@ -637,22 +649,22 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
carOrderDetail.setOverStandard("是"); //无
}
carOrderDetail.setOverStandardReason(""); //无
Optional<OrderEvent> first2 = orderDetail.getOrderEventList()
.stream()
.findFirst();
if (first2 != null){
carOrderDetail.setOverStandardReason(first2.get().getExtension());
}
// carOrderDetail.setParentOrderNo(parentOrderNo); //无
// carOrderDetail.setOriginalOrderNo(originalOrderNo); //无
// carOrderDetail.setScheduleNum(scheduleNum); //无
// carOrderDetail.setBookingName(bookingName); //无
// carOrderDetail.setBookingUserPhone(bookingUserPhone);//无
// carOrderDetail.setCancellationFee(cancellationFee); //无
// carOrderDetail.setStandardItems(standardItems); //无
// carOrderDetail.setOverStandardReason(overStandardReason); contactName
// carOrderDetail.setBOOK_ORG_STRUCT_1(BOOK_ORG_STRUCT_1); //无
// carOrderDetail.setBOOK_ORG_STRUCT_2(BOOK_ORG_STRUCT_2); //无
// carOrderDetail.setBOOK_ORG_STRUCT_3(BOOK_ORG_STRUCT_3); //无

19
src/test/java/com/chint/CTripTest.java
View File

@ -204,27 +204,10 @@ public class CTripTest {
@Test
void search() {
BaseContext.setCurrentUser(user);
SearchOrderResponse response = orderSearchRequest.searchOrderResponseByOrderId("29821751403");
System.out.println(response);
response = orderSearchRequest.searchOrderResponseByOrderId("31018642992");
System.out.println(response);
response = orderSearchRequest.searchOrderResponseByOrderId("31021935860");
System.out.println(response);
response = orderSearchRequest.searchOrderResponseByOrderId("31022442484");
SearchOrderResponse response = orderSearchRequest.searchOrderResponseByOrderId("29882203254");
System.out.println(response);
response = orderSearchRequest.searchOrderResponseByOrderId("31024617012");
System.out.println(response);
response = orderSearchRequest.searchOrderResponseByOrderId("31025266484");
System.out.println(response);
response = orderSearchRequest.searchOrderResponseByOrderId("31025198037");
System.out.println(response);
}
// @Test