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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
lulz1 2024-04-03 08:53:39 +08:00
parent dfa1248fe0 616ac89182
commit 7841af05b4
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chint/domain/aggregates/order/order_record/OrderTrainRecord.java
View File

@ -63,6 +63,7 @@ public class OrderTrainRecord extends OrderBaseRecord{
private String bookOrgCode3; // 出行人组织架构信息3 private String bookOrgCode3; // 出行人组织架构信息3
private String projectOrderNo; // 项目订单号 private String projectOrderNo; // 项目订单号
private String offlineCcomyCode; // 成本中心 private String offlineCcomyCode; // 成本中心
private String payAmount;//支付总金额
private String travelUserBirthday; // 生日 private String travelUserBirthday; // 生日
private String travelUserPhone; // 出行人手机号 private String travelUserPhone; // 出行人手机号
private String travelUserSex; // 性别： 0保密不展示 1男 2女 private String travelUserSex; // 性别： 0保密不展示 1男 2女

49
src/main/java/com/chint/domain/factoriy/order_record/LyOrderRecordExtensionFactory.java
View File

@ -108,7 +108,7 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
.setReceiptsNumOrigin(lyOrderFlightRecord.getOutApplayOrderNo())//原关联申请单号 .setReceiptsNumOrigin(lyOrderFlightRecord.getOutApplayOrderNo())//原关联申请单号
.setUserName(lyOrderFlightRecord.getPassengerName())//出行人姓名 .setUserName(lyOrderFlightRecord.getPassengerName())//出行人姓名
.setUserCode(lyOrderFlightRecord.getPassengerExternalId())//出行人编码 .setUserCode(lyOrderFlightRecord.getPassengerExternalId())//出行人编码
.setOverStandard("是".equals(lyOrderFlightRecord.getOverStandardStatus()) ? "1" : "0")//"是否违规（超标）：0否 ,1是" .setOverStandard(lyOrderFlightRecord.getOverStandardStatus())//"是否违规（超标）：0否 ,1是"
.setOverStandardReason(lyOrderFlightRecord.getViolationReason())//违规原因（超标原因） .setOverStandardReason(lyOrderFlightRecord.getViolationReason())//违规原因（超标原因）
.setStartAirportName(flightOrderDetail.getStartAirportName())//起飞机场名称 .setStartAirportName(flightOrderDetail.getStartAirportName())//起飞机场名称
.setStartCityCode(flightOrderDetail.getStartCityCode())//起飞城市编码 .setStartCityCode(flightOrderDetail.getStartCityCode())//起飞城市编码
@ -141,17 +141,17 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
.setSeatDiscount(lyOrderFlightRecord.getDiscount())//折扣率 .setSeatDiscount(lyOrderFlightRecord.getDiscount())//折扣率
.setSeatPoint(lyOrderFlightRecord.getSeatClass())//舱位 .setSeatPoint(lyOrderFlightRecord.getSeatClass())//舱位
.setSeatPointName(lyOrderFlightRecord.getSeatClass())//舱位名称 .setSeatPointName(lyOrderFlightRecord.getSeatClass())//舱位名称
.setUseStatus(lyOrderFlightRecord.getTicketStatus()) //机票使用情况 .setUseStatus(lyOrderFlightRecord.getTicketStatus())//机票使用情况
.setOrderSource(lyOrderFlightRecord.getBookingPlat()) //预订来源：线上/线下 .setOrderSource(StringUtils.isNotBlank(lyOrderFlightRecord.getOutApplayOrderNo()) ? "Y" : "N") //预订来源：线上/线下
.setNotLowReason("正泰机票无超标") //未预订最低价原因 .setNotLowReason("正泰机票无超标") //未预订最低价原因
.setBookOrgCode1(lyOrderFlightRecord.getPassengerDepartment()) //出行人组织架构信息1 .setBookOrgCode1(lyOrderFlightRecord.getPassengerDepartment()) //出行人组织架构信息1
.setBookOrgCode2(lyOrderFlightRecord.getPassengerDepartment()) //出行人组织架构信息2 .setBookOrgCode2(lyOrderFlightRecord.getPassengerDepartment()) //出行人组织架构信息2
.setBookOrgCode3(lyOrderFlightRecord.getPassengerDepartment()) //出行人组织架构信息3 .setBookOrgCode3(lyOrderFlightRecord.getPassengerDepartment()) //出行人组织架构信息3
.setOfflineCcomyCode(lyOrderFlightRecord.getPassengerCostCenter()) //成本中心 .setOfflineCcomyCode(lyOrderFlightRecord.getPassengerCostCenter()) //成本中心
.setOrderStatus("") //结算状态 .setOrderStatus("") //结算状态
/* .setExpenseOrderAmount("") //订单金额 // .setExpenseOrderAmount("") //订单金额
.setSettleOrderFlag() //订单对账状态 // .setSettleOrderFlag() //订单对账状态
.setPayAmount() //支付金额*/ .setPayAmount(String.valueOf(lyOrderFlightRecord.getToBePayAmount() + lyOrderFlightRecord.getServiceAmount()))//支付金额
; ;
} }
@ -177,7 +177,7 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
.setOriginalOrderNo(lyOrderHotelRecord.getOriginOrderSerialNo())//原始订单号 .setOriginalOrderNo(lyOrderHotelRecord.getOriginOrderSerialNo())//原始订单号
.setBrandGroup("") //酒店品牌集团 .setBrandGroup("") //酒店品牌集团
.setBrandName("") //酒店品牌 .setBrandName("") //酒店品牌
.setOverStandard("是".equals(lyOrderHotelRecord.getOverStandardStatus()) ? "1" : "0") //"是否违规（超标） 0否,1是" .setOverStandard(lyOrderHotelRecord.getOverStandardStatus()) //"是否违规（超标） 0否,1是"
.setOverStandardReason(lyOrderHotelRecord.getViolationReason());//违规原因（超标原因） .setOverStandardReason(lyOrderHotelRecord.getViolationReason());//违规原因（超标原因）
orderHotelRecord.setReceiptsNum(getReceiptsNum(lyOrderHotelRecord.getOutApplayOrderNo(), routeOrder))//关联申请单号 orderHotelRecord.setReceiptsNum(getReceiptsNum(lyOrderHotelRecord.getOutApplayOrderNo(), routeOrder))//关联申请单号
@ -214,16 +214,15 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
.setTaxCusFee("") //托管费税费 .setTaxCusFee("") //托管费税费
.setRoomTypeName(lyOrderHotelRecord.getBedType()) //房型 .setRoomTypeName(lyOrderHotelRecord.getBedType()) //房型
.setStarRate(hotelOrderDetail.getStarRate()) //星级 .setStarRate(hotelOrderDetail.getStarRate()) //星级
.setOrderSource(lyOrderHotelRecord.getBookingPlat()) //预订来源：线上/线下 .setOrderSource(StringUtils.isNotBlank(lyOrderHotelRecord.getOutApplayOrderNo()) ? "Y" : "N") //预订来源：线上/线下
.setBookOrgCode1(lyOrderHotelRecord.getPassengerDepartment()) //入住人组织架构信息1 .setBookOrgCode1(lyOrderHotelRecord.getPassengerDepartment()) //入住人组织架构信息1
.setBookOrgCode2(hotelOrderDetail.getBOOK_ORG_STRUCT_2()) //入住人组织架构信息2 .setBookOrgCode2(hotelOrderDetail.getBOOK_ORG_STRUCT_2()) //入住人组织架构信息2
.setBookOrgCode3(hotelOrderDetail.getBOOK_ORG_STRUCT_3()) //入住人组织架构信息3 .setBookOrgCode3(hotelOrderDetail.getBOOK_ORG_STRUCT_3()) //入住人组织架构信息3
.setOfflineCcomyCode(lyOrderHotelRecord.getPassengerCostCenter()) //成本中心 .setOfflineCcomyCode(lyOrderHotelRecord.getPassengerCostCenter()) //成本中心
/* .setOrderStatus() //结算状态 .setOrderStatus("") //结算状态
.setExpenseOrderAmount() //订单金额 // .setExpenseOrderAmount("") //订单金额
.setSettleOrderFlag() //订单对账状态 // .setSettleOrderFlag() //订单对账状态
.setPayAmount() //支付金额 .setPayAmount(String.valueOf(lyOrderHotelRecord.getToBePayAmount() + lyOrderHotelRecord.getServiceAmount())) //支付金额
*/
; ;
} }
@ -250,7 +249,7 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
.setReceiptsNumOrigin(lyOrderTrainRecord.getOutApplayOrderNo()) //原关联申请单号 .setReceiptsNumOrigin(lyOrderTrainRecord.getOutApplayOrderNo()) //原关联申请单号
.setStartDate(lyOrderTrainRecord.getPlanBeginDate()) //出发日期 .setStartDate(lyOrderTrainRecord.getPlanBeginDate()) //出发日期
.setArriveDate(lyOrderTrainRecord.getPlanEndDate()) //到达日期 .setArriveDate(lyOrderTrainRecord.getPlanEndDate()) //到达日期
.setOverStandard("是".equals(lyOrderTrainRecord.getOverStandardStatus()) ? "1" : "0") //"是否违规（超标）：0否 1是" .setOverStandard(lyOrderTrainRecord.getOverStandardStatus()) //"是否违规（超标）：0否 1是"
.setOverStandardReason(lyOrderTrainRecord.getViolationReason()) //违规原因（超标原因） .setOverStandardReason(lyOrderTrainRecord.getViolationReason()) //违规原因（超标原因）
.setChangeAddAmount(String.valueOf(lyOrderTrainRecord.getToBePayAmount())) //改签收款 .setChangeAddAmount(String.valueOf(lyOrderTrainRecord.getToBePayAmount())) //改签收款
.setChangeCost(String.valueOf(lyOrderTrainRecord.getChangeFee())) //改签手续费 .setChangeCost(String.valueOf(lyOrderTrainRecord.getChangeFee())) //改签手续费
@ -275,16 +274,16 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
.setTrainNo(lyOrderTrainRecord.getTrainNo()) //车次 .setTrainNo(lyOrderTrainRecord.getTrainNo()) //车次
.setUserCode(lyOrderTrainRecord.getPassengerNo())//出行人编码 .setUserCode(lyOrderTrainRecord.getPassengerNo())//出行人编码
.setUserName(lyOrderTrainRecord.getPassengerName())//出行人姓名 .setUserName(lyOrderTrainRecord.getPassengerName())//出行人姓名
.setOrderSource(lyOrderTrainRecord.getBookingPlat())//预订来源：线上 / 线下 .setOrderSource(StringUtils.isNotBlank(lyOrderTrainRecord.getOutApplayOrderNo()) ? "Y" : "N")//预订来源：线上 / 线下
// .setOrderSource(lyOrderTrainRecord.getBookingPlat())//预订来源：线上 / 线下
.setBookOrgCode1(lyOrderTrainRecord.getPassengerDepartment())//出行人组织架构信息1 .setBookOrgCode1(lyOrderTrainRecord.getPassengerDepartment())//出行人组织架构信息1
.setBookOrgCode2(trainOrderDetail.getBOOK_ORG_STRUCT_2())//出行人组织架构信息2 .setBookOrgCode2(trainOrderDetail.getBOOK_ORG_STRUCT_2())//出行人组织架构信息2
.setBookOrgCode3(trainOrderDetail.getBOOK_ORG_STRUCT_3())//出行人组织架构信息3 .setBookOrgCode3(trainOrderDetail.getBOOK_ORG_STRUCT_3())//出行人组织架构信息3
.setOfflineCcomyCode(lyOrderTrainRecord.getPassengerCostCenter())//成本中心 .setOfflineCcomyCode(lyOrderTrainRecord.getPassengerCostCenter())//成本中心
/* .setOrderStatus() //结算状态 // .setOrderStatus() //结算状态
.setExpenseOrderAmount() //订单金额 // .setExpenseOrderAmount() //订单金额
.setSettleOrderFlag() //订单对账状态 // .setSettleOrderFlag() //订单对账状态
.setPayAmount() //支付金额 .setPayAmount(String.valueOf(lyOrderTrainRecord.getToBePayAmount() + lyOrderTrainRecord.getServiceAmount())) //支付金额
*/
/* .setTravelUserBirthday("")//生日 /* .setTravelUserBirthday("")//生日
.setTravelUserPhone("") //出行人手机号 .setTravelUserPhone("") //出行人手机号
@ -315,7 +314,7 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
.setBillNo(lyOrderCarRecord.getBillOrderNo()); //账单号 .setBillNo(lyOrderCarRecord.getBillOrderNo()); //账单号
orderCarRecord.setReceiptsNum(getReceiptsNum(lyOrderCarRecord.getOutApplayOrderNo(), routeOrder))//关联申请单号 orderCarRecord.setReceiptsNum(getReceiptsNum(lyOrderCarRecord.getOutApplayOrderNo(), routeOrder))//关联申请单号
.setReceiptsNumOrigin(lyOrderCarRecord.getOutApplayOrderNo()) //原关联申请单号 .setReceiptsNumOrigin(lyOrderCarRecord.getOutApplayOrderNo()) //原关联申请单号
.setOverStandard("0") //"是否违规（超标）：0否 1是" .setOverStandard("否") //"是否违规（超标）：0否 1是"
.setOverStandardReason("无")//违规原因（超标原因） .setOverStandardReason("无")//违规原因（超标原因）
.setOrderNo(lyOrderCarRecord.getOrderSerialNo()) //订单号 .setOrderNo(lyOrderCarRecord.getOrderSerialNo()) //订单号
.setParentOrderNo(carOrderDetail.getParentOrderNo())//父级订单号 .setParentOrderNo(carOrderDetail.getParentOrderNo())//父级订单号
@ -348,10 +347,10 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
.setBookOrgCode3(carOrderDetail.getBOOK_ORG_STRUCT_3()) //用车人组织架构信息3 .setBookOrgCode3(carOrderDetail.getBOOK_ORG_STRUCT_3()) //用车人组织架构信息3
.setPaymentType(String.valueOf(getPaymentType(lyOrderCarRecord.getPayType()))) //"付款方式0：公司统付 1：个人付 2：混付" .setPaymentType(String.valueOf(getPaymentType(lyOrderCarRecord.getPayType()))) //"付款方式0：公司统付 1：个人付 2：混付"
.setOfflineCcomyCode(lyOrderCarRecord.getPassengerDepartment()) //成本中心 .setOfflineCcomyCode(lyOrderCarRecord.getPassengerDepartment()) //成本中心
.setOrderSource(lyOrderCarRecord.getBookingPlat()) //预订来源：线上/线下 .setOrderSource(StringUtils.isNotBlank(lyOrderCarRecord.getOutApplayOrderNo()) ? "Y" : "N") //预订来源：线上/线下
/* .setExpenseOrderAmount() //订单金额 // .setExpenseOrderAmount() //订单金额
.setSettleOrderFlag() //订单对账状态 // .setSettleOrderFlag() //订单对账状态
.setPayAmount()// 支付金额*/ .setPayAmount(String.valueOf(lyOrderCarRecord.getToBePayAmount() + lyOrderCarRecord.getServiceAmount()))// 支付金额
; ;
} }