diff --git a/src/main/java/com/chint/domain/aggregates/order/order_record/OrderFlightRecord.java b/src/main/java/com/chint/domain/aggregates/order/order_record/OrderFlightRecord.java index ab0360bb..795e137c 100644 --- a/src/main/java/com/chint/domain/aggregates/order/order_record/OrderFlightRecord.java +++ b/src/main/java/com/chint/domain/aggregates/order/order_record/OrderFlightRecord.java @@ -79,6 +79,7 @@ public class OrderFlightRecord extends OrderBaseRecord { private String orderStatus; private String createTime; private String receiptsNumOrigin;//原差旅申请单单号 + private String payAmount; // 加载基础订单信息 public OrderFlightRecord loadBasicOrderInfo(String orderNo, @@ -153,13 +154,14 @@ public class OrderFlightRecord extends OrderBaseRecord { public OrderFlightRecord loadFinancialAndPricingInfo(String accountPeriod, String billNo, String orderAmount, - + String payAmount, String ycabinFullPrice, String policyLowestPrice, String flightLowestPrice) { this.setAccountPeriod(accountPeriod); this.setBillNo(billNo); this.setOrderAmount(orderAmount); + this.setPayAmount(payAmount); this.setYcabinFullPrice(ycabinFullPrice); //经济舱全价 this.setPolicyLowestPrice(policyLowestPrice); // 比价范围最低价 this.setFlightLowestPrice(flightLowestPrice); // 航班最低价 diff --git a/src/main/java/com/chint/domain/factoriy/order_record/CTripOrderRecordExtensionFactory.java b/src/main/java/com/chint/domain/factoriy/order_record/CTripOrderRecordExtensionFactory.java index 5b8fc581..06fe0202 100644 --- a/src/main/java/com/chint/domain/factoriy/order_record/CTripOrderRecordExtensionFactory.java +++ b/src/main/java/com/chint/domain/factoriy/order_record/CTripOrderRecordExtensionFactory.java @@ -269,7 +269,8 @@ public class CTripOrderRecordExtensionFactory implements OrderRecordExtensionFac String batchNo = cTripFlightRecordBase.getBatchStartDate().substring(0, 6); orderFlightRecord.loadFinancialAndPricingInfo(batchNo, cTripFlightRecordBase.getSubAccCheckBatchNo(), - String.valueOf(cTripFlightRecordBase.getPrice()), + String.valueOf(cTripFlightRecordBase.getAmount()), + String.valueOf(cTripFlightRecordBase.getRealAmountWithPostServiceFee()), String.valueOf(cTripFlightInfo.getEClassStandardPrice()), String.valueOf(cTripFlightInfo.getLowPrice()), String.valueOf(cTripFlightInfo.getLowPrice())); @@ -285,7 +286,7 @@ public class CTripOrderRecordExtensionFactory implements OrderRecordExtensionFac orderFlightRecord.loadExtraFeeInfo(String.valueOf(cTripFlightRecordBase.getPostServiceFee()), String.valueOf(cTripFlightRecordBase.getRebookQueryFee()), String.valueOf(cTripFlightRecordBase.getRefund()), - String.valueOf(cTripFlightRecordBase.getAmount()), + cTripFlightRecordBase.getOrderDetailType().equals("改签") ? String.valueOf(cTripFlightRecordBase.getAmount()) : KEEP_TWO_DECIMAL_ZERO, String.valueOf(cTripFlightRecordBase.getSettItineraryFee())); // 加载来源