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:
dengwc 2024-04-02 14:58:02 +08:00
parent 5bb2c31ddc 040dbacfa2
commit 56f89260fc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chint/domain/aggregates/order/order_record/OrderFlightRecord.java
View File

@ -79,6 +79,7 @@ public class OrderFlightRecord extends OrderBaseRecord {
private String orderStatus; private String orderStatus;
private String createTime; private String createTime;
private String receiptsNumOrigin;//原差旅申请单单号 private String receiptsNumOrigin;//原差旅申请单单号
private String payAmount;
// 加载基础订单信息 // 加载基础订单信息
public OrderFlightRecord loadBasicOrderInfo(String orderNo, public OrderFlightRecord loadBasicOrderInfo(String orderNo,
@ -153,13 +154,14 @@ public class OrderFlightRecord extends OrderBaseRecord {
public OrderFlightRecord loadFinancialAndPricingInfo(String accountPeriod, public OrderFlightRecord loadFinancialAndPricingInfo(String accountPeriod,
String billNo, String billNo,
String orderAmount, String orderAmount,
String payAmount,
String ycabinFullPrice, String ycabinFullPrice,
String policyLowestPrice, String policyLowestPrice,
String flightLowestPrice) { String flightLowestPrice) {
this.setAccountPeriod(accountPeriod); this.setAccountPeriod(accountPeriod);
this.setBillNo(billNo); this.setBillNo(billNo);
this.setOrderAmount(orderAmount); this.setOrderAmount(orderAmount);
this.setPayAmount(payAmount);
this.setYcabinFullPrice(ycabinFullPrice); //经济舱全价 this.setYcabinFullPrice(ycabinFullPrice); //经济舱全价
this.setPolicyLowestPrice(policyLowestPrice); // 比价范围最低价 this.setPolicyLowestPrice(policyLowestPrice); // 比价范围最低价
this.setFlightLowestPrice(flightLowestPrice); // 航班最低价 this.setFlightLowestPrice(flightLowestPrice); // 航班最低价

5
src/main/java/com/chint/domain/factoriy/order_record/CTripOrderRecordExtensionFactory.java
View File

@ -269,7 +269,8 @@ public class CTripOrderRecordExtensionFactory implements OrderRecordExtensionFac
String batchNo = cTripFlightRecordBase.getBatchStartDate().substring(0, 6); String batchNo = cTripFlightRecordBase.getBatchStartDate().substring(0, 6);
orderFlightRecord.loadFinancialAndPricingInfo(batchNo, orderFlightRecord.loadFinancialAndPricingInfo(batchNo,
cTripFlightRecordBase.getSubAccCheckBatchNo(), cTripFlightRecordBase.getSubAccCheckBatchNo(),
String.valueOf(cTripFlightRecordBase.getPrice()), String.valueOf(cTripFlightRecordBase.getAmount()),
String.valueOf(cTripFlightRecordBase.getRealAmountWithPostServiceFee()),
String.valueOf(cTripFlightInfo.getEClassStandardPrice()), String.valueOf(cTripFlightInfo.getEClassStandardPrice()),
String.valueOf(cTripFlightInfo.getLowPrice()), String.valueOf(cTripFlightInfo.getLowPrice()),
String.valueOf(cTripFlightInfo.getLowPrice())); String.valueOf(cTripFlightInfo.getLowPrice()));
@ -285,7 +286,7 @@ public class CTripOrderRecordExtensionFactory implements OrderRecordExtensionFac
orderFlightRecord.loadExtraFeeInfo(String.valueOf(cTripFlightRecordBase.getPostServiceFee()), orderFlightRecord.loadExtraFeeInfo(String.valueOf(cTripFlightRecordBase.getPostServiceFee()),
String.valueOf(cTripFlightRecordBase.getRebookQueryFee()), String.valueOf(cTripFlightRecordBase.getRebookQueryFee()),
String.valueOf(cTripFlightRecordBase.getRefund()), String.valueOf(cTripFlightRecordBase.getRefund()),
String.valueOf(cTripFlightRecordBase.getAmount()), cTripFlightRecordBase.getOrderDetailType().equals("改签") ? String.valueOf(cTripFlightRecordBase.getAmount()) : KEEP_TWO_DECIMAL_ZERO,
String.valueOf(cTripFlightRecordBase.getSettItineraryFee())); String.valueOf(cTripFlightRecordBase.getSettItineraryFee()));
// 加载来源 // 加载来源