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-03-13 08:48:25 +08:00
parent 304bc330df 860ebe6dd7
commit b0503bc31f
6 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/chint/domain/aggregates/order/CarOrderDetail.java
View File

@ -21,6 +21,9 @@ public class CarOrderDetail implements Serializable {
// 订单号
private String orderNo;
// 消费明细唯一标识
private String detailId;
// 是否超标
private String overStandard;

3
src/main/java/com/chint/domain/aggregates/order/FlightOrderDetail.java
View File

@ -21,6 +21,9 @@ public class FlightOrderDetail implements Serializable {
// 订单号
private String orderNo;
// 消费明细唯一标识
private String detailId;
// 是否超标
private String overStandard;

3
src/main/java/com/chint/domain/aggregates/order/HotelOrderDetail.java
View File

@ -27,6 +27,9 @@ public class HotelOrderDetail implements Serializable {
// 订单号
private String orderNo;
// 消费明细唯一标识
private String detailId;
// 是否超标
private String overStandard;

3
src/main/java/com/chint/domain/aggregates/order/TrainOrderDetail.java
View File

@ -24,6 +24,9 @@ public class TrainOrderDetail implements Serializable {
// 订单号
private String orderNo;
// 消费明细唯一标识
private String detailId;
// 是否超标
private String overStandard;

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

@ -130,6 +130,7 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
}
flightOrderDetail.setOrderNo(orderNo);
flightOrderDetail.setDetailId(orderNo);
first.ifPresent(orderDetail ->{
OrderEvent lastEvent = orderDetail.getLastEvent();
if(lastEvent != null){
@ -236,7 +237,6 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
// flightOrderDetail.setPostServiceFee();
// flightOrderDetail.setParentOrderNo();
// flightOrderDetail.setOriginalOrderNo();
// flightOrderDetail.setTickets(); //文档上说就是这个flightOrderBasicInfo
// flightOrderDetail.setInsuranceFee();
return flightOrderDetail;
@ -343,9 +343,10 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory {
if (hotelOrderInfoEntity != null){
hotelOrderDetail.setOrderNo(hotelOrderInfoEntity.getOrderID()); //订单号
hotelOrderDetail.setDetailId(hotelOrderInfoEntity.getOrderID());
hotelOrderDetail.setPaymentType(hotelOrderInfoEntity.getPayType());
hotelOrderDetail.setReceiptsNum(hotelOrderInfoEntity.getJourneyNo());
hotelOrderDetail.setOrderNo(hotelOrderInfoEntity.getOrderID()); //订单号
hotelOrderDetail.setCreateTime(hotelOrderInfoEntity.getOrderDate());
hotelOrderDetail.setCheckInCity(hotelOrderInfoEntity.getCityName());
hotelOrderDetail.setHotelName(hotelOrderInfoEntity.getHotelName());

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

@ -155,6 +155,8 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
if (orderDetails != null) {
flightOrderDetail.setOrderNo(orderDetails.getOrderSerialNo());
flightOrderDetail.setDetailId(orderDetails.getOrderSerialNo());
flightOrderDetail.setOverStandard(String.valueOf(orderDetails.getRuleViolate()));
flightOrderDetail.setParentOrderNo(orderDetails.getParentOrderSerialNo());
flightOrderDetail.setOriginalOrderNo(orderDetails.getOriginalOrderNo());
@ -313,6 +315,7 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
}
if (orderInfo != null) {
hotelOrderDetail.setOrderNo(orderInfo.getOrderSerialNo())
.setDetailId(orderInfo.getOrderSerialNo())
.setSupplier(SUPPLIER_L_Y_EXTENSION_NAME)
.setOverStandard(String.valueOf(orderInfo.getRuleViolate()))
.setReceiptsNum(orderInfo.getTravelApplyNo())
@ -457,6 +460,8 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
if (trainDetailData != null) {
trainOrderDetail.setOrderNo(trainDetailData.getOrderNo());
trainOrderDetail.setDetailId(trainDetailData.getOrderNo());
trainOrderDetail.setParentOrderNo(trainDetailData.getParentOrderSerialNo());
Optional<OrderDetail> first1 = routeOrder
@ -594,6 +599,8 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory {
}
}
carOrderDetail.setOrderNo(carOrderDetailInfo.getOrderSerialNo());
carOrderDetail.setDetailId(carOrderDetailInfo.getOrderSerialNo());
Optional<OrderDetail> first1 = routeOrder
.getOrderDetails()
.stream()