From 040dbacfa2054563a763ee0ad667b7e0ca744a04 Mon Sep 17 00:00:00 2001
From: lulz1 <lulz1@chint.com>
Date: Tue, 2 Apr 2024 14:19:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E7=A5=A8=E7=BB=93=E7=AE=97=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=80=BB=E4=BB=98=E6=AC=BE=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aggregates/order/order_record/OrderFlightRecord.java     | 4 +++-
 .../order_record/CTripOrderRecordExtensionFactory.java       | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

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()));
 
         // 加载来源