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:10:48 +08:00
parent c125c86259
commit b1b83c8139
2 changed files with 34 additions and 10 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

@ -408,11 +408,14 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
hotelOrderDetail.setPostServiceFee(hotelOrderInfoEntity.getServicefee());
hotelOrderDetail.setStandardItems(hotelOrderInfoEntity.getTPMaxPrice());
hotelOrderDetail.setOverStandardReason(hotelOrderInfoEntity.getLowPriceRCInfo());
hotelOrderDetail.setOverStandard(hotelOrderInfoEntity.getLowPriceRCInfo() == null ? "否":"是"); //是否超标
hotelOrderDetail.setAgreementHotel(hotelOrderInfoEntity.getHotelType());
if (hotelOrderInfoEntity.getHotelType().equals("协议酒店")){
hotelOrderDetail.setAgreementHotel("是");
}else {
hotelOrderDetail.setAgreementHotel("否");
}
ClientInfo clientInfo = null;
if (!hotelOrderInfoEntity.getClientInfo().isEmpty()) {

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

@ -146,6 +146,7 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
if (user != null){
flightOrderDetail.setBookingUserCode(user.getEmployeeNo());
flightOrderDetail.setBookingName(user.getName());
flightOrderDetail.setBookingUserPhone(user.getPhoneNumber());
}
if (orderDetails != null) {
@ -309,15 +310,18 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
hotelOrderDetail.setBelongSysType("AN_FK");
}
}
String EmployeeNo = routeOrder.getUserId();
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())
.setBookingUserCode(orderInfo.getOutEmployeeId())
.setOrderAmount(String.valueOf(orderInfo.getBusinessAmount()))
.setCreateTime(orderInfo.getCreateTime())
.setCheckInCity(hotelInfo.getCityName())
@ -339,7 +343,7 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
.setPostServiceFee(String.valueOf(orderInfo.getAfterSettlementServicePrice()))
.setRefundAmount(String.valueOf(orderInfo.getRefundPrice()))
.setOverStandardReason(orderInfo.getFoulReason())
.setAgreementHotel(String.valueOf(orderInfo.getProtocolType()));
.setAgreementHotel(orderInfo.getProtocolType()==0?"否":"是");
// .setBookingName(orderInfo.getContactName()) //预订人名字和电话使用contact是否正确
// .setBookingUserPhone(orderInfo.getContactPhone())
// .setNightRates() //nightrates 是hotelInfo
@ -349,6 +353,12 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
// .setBOOK_ORG_STRUCT_3("Org C")
}
if (user != null){
hotelOrderDetail.setBookingUserCode(user.getEmployeeNo());
hotelOrderDetail.setBookingName(user.getName());
hotelOrderDetail.setBookingUserPhone(user.getPhoneNumber());
}
ApproveOrderNo approveOrderNo = routeOrder.getApproveOrderNo();
if (approveOrderNo != null){
@ -476,12 +486,17 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
trainOrderDetail.setOrderStatus(lastEvent.mapToOrderDetailStatus());
}}
);
String EmployeeNo = routeOrder.getUserId();
User user = userRepository.findByUserEmployeeNo(EmployeeNo);
if (user != null){
trainOrderDetail.setBookingUserCode(user.getEmployeeNo());
trainOrderDetail.setBookingName(user.getName());
trainOrderDetail.setBookingUserPhone(user.getPhoneNumber());
}
// trainOrderDetail.setReceiptsNum(trainDetailData.getTravelData().getTravelApplyNo());
trainOrderDetail.setReceiptsNum(routeOrder.getRouteOrderNo());
trainOrderDetail.setBookingUserCode(trainDetailData.getOutEmployeeId());
trainOrderDetail.setCreateTime(trainDetailData.getOutTicketTime());
trainOrderDetail.setStartTime(trainDetailData.getPlanBeginDate());
trainOrderDetail.setArriveTime(trainDetailData.getPlanEndDate());
@ -550,7 +565,6 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
trainOrderDetail.setOverStandardReason(""); //无
// trainOrderDetail.setOriginalOrderNo("originalOrderNo"); //无
// trainOrderDetail.setBookingName(trainDetailData.getContactInfo().getPersonName()); //不确定是否是这个字段（文档没写）猜测
// trainOrderDetail.setBookingUserPhone(trainDetailData.getContactInfo().getPersonMobile() != null ?
// trainDetailData.getContactInfo().getPersonMobile() :
// trainDetailData.getContactInfo().getPersonTelephone()); //不确定是否是这个字段（文档没写）猜测
@ -617,7 +631,14 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
carOrderDetail.setOrderStatus(lastEvent.mapToOrderDetailStatus());
}}
);
carOrderDetail.setBookingUserCode(carOrderDetailInfo.getOutEmployeeId());
String EmployeeNo = routeOrder.getUserId();
User user = userRepository.findByUserEmployeeNo(EmployeeNo);
if (user!=null){
carOrderDetail.setBookingUserCode(user.getEmployeeNo());
carOrderDetail.setBookingName(user.getName());
carOrderDetail.setBookingUserPhone(user.getPhoneNumber());
}
carOrderDetail.setCreateTime(carOrderDetailInfo.getCreateTime());
carOrderDetail.setOrderAmount(String.valueOf(carOrderDetailInfo.getTotalPrice()));
carOrderDetail.setUserName(carOrderDetailInfo.getContactName());