diff --git a/src/main/java/com/chint/domain/aggregates/order/CarOrderDetail.java b/src/main/java/com/chint/domain/aggregates/order/CarOrderDetail.java index 92204aac..0857da7a 100644 --- a/src/main/java/com/chint/domain/aggregates/order/CarOrderDetail.java +++ b/src/main/java/com/chint/domain/aggregates/order/CarOrderDetail.java @@ -37,7 +37,7 @@ public class CarOrderDetail implements Serializable { // 原始订单号 private String originalOrderNo; - // 订单状态 + // 订单状态:0-取消 1-出票成功,2-改签成功,3-退票成功 private String orderStatus; // 核算企业id diff --git a/src/main/java/com/chint/domain/aggregates/order/FlightOrderDetail.java b/src/main/java/com/chint/domain/aggregates/order/FlightOrderDetail.java index e8ff4f99..181d6488 100644 --- a/src/main/java/com/chint/domain/aggregates/order/FlightOrderDetail.java +++ b/src/main/java/com/chint/domain/aggregates/order/FlightOrderDetail.java @@ -39,7 +39,7 @@ public class FlightOrderDetail implements Serializable { // 原始订单号 private String originalOrderNo; - // 订单状态:1-出票成功,2-改签成功,3-退票成功 + // 订单状态:0-取消 1-出票成功,2-改签成功,3-退票成功 private String orderStatus; // 核算企业id diff --git a/src/main/java/com/chint/domain/aggregates/order/TrainOrderDetail.java b/src/main/java/com/chint/domain/aggregates/order/TrainOrderDetail.java index b0d9b923..e37e9bdd 100644 --- a/src/main/java/com/chint/domain/aggregates/order/TrainOrderDetail.java +++ b/src/main/java/com/chint/domain/aggregates/order/TrainOrderDetail.java @@ -40,7 +40,7 @@ public class TrainOrderDetail implements Serializable { // 原始订单号 private String originalOrderNo; - // 订单状态:1-出票成功,2-改签成功,3-退票成功 + // 订单状态:0-取消 1-出票成功,2-改签成功,3-退票成功 private String orderStatus; // 核算企业id diff --git a/src/main/java/com/chint/manage/entity/excel/CarOrderDetailExcel.java b/src/main/java/com/chint/manage/entity/excel/CarOrderDetailExcel.java index 2a577ff5..d5b8fb09 100644 --- a/src/main/java/com/chint/manage/entity/excel/CarOrderDetailExcel.java +++ b/src/main/java/com/chint/manage/entity/excel/CarOrderDetailExcel.java @@ -36,6 +36,14 @@ public class CarOrderDetailExcel extends BaseExcel{ @ExcelProperty("订单创建时间") private String createTime; - + public String getOrderStatus() { + return switch (orderStatus) { + case "0" -> "取消"; + case "1" -> "出票成功"; + case "2" -> "改签成功"; + case "3" -> "退票成功"; + default -> orderStatus; + }; + } } diff --git a/src/main/java/com/chint/manage/entity/excel/FlightOrderDetailExcel.java b/src/main/java/com/chint/manage/entity/excel/FlightOrderDetailExcel.java index 07068d32..872cf4cd 100644 --- a/src/main/java/com/chint/manage/entity/excel/FlightOrderDetailExcel.java +++ b/src/main/java/com/chint/manage/entity/excel/FlightOrderDetailExcel.java @@ -3,6 +3,9 @@ package com.chint.manage.entity.excel; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; +import static com.chint.infrastructure.constant.LegConstant.*; +import static com.chint.infrastructure.constant.LegConstant.LEG_TYPE_OTHER_EN_NAME; + @Data public class FlightOrderDetailExcel extends BaseExcel{ @@ -23,7 +26,7 @@ public class FlightOrderDetailExcel extends BaseExcel{ @ExcelProperty("订单状态") private String orderStatus; @ExcelProperty("是否超标") - private String isOverStandard; + private String overStandard; @ExcelProperty("超标原因") private String overStandardReason; @ExcelProperty("订单号") @@ -32,4 +35,13 @@ public class FlightOrderDetailExcel extends BaseExcel{ private String createTime; + public String getOrderStatus() { + return switch (orderStatus) { + case "0" -> "取消"; + case "1" -> "出票成功"; + case "2" -> "改签成功"; + case "3" -> "退票成功"; + default -> orderStatus; + }; + } } diff --git a/src/main/java/com/chint/manage/entity/excel/TrainOrderDetailExcel.java b/src/main/java/com/chint/manage/entity/excel/TrainOrderDetailExcel.java index dd179ff5..b38e53d7 100644 --- a/src/main/java/com/chint/manage/entity/excel/TrainOrderDetailExcel.java +++ b/src/main/java/com/chint/manage/entity/excel/TrainOrderDetailExcel.java @@ -36,4 +36,13 @@ public class TrainOrderDetailExcel extends BaseExcel{ @ExcelProperty("订单创建时间") private String createTime; + public String getOrderStatus() { + return switch (orderStatus) { + case "0" -> "取消"; + case "1" -> "出票成功"; + case "2" -> "改签成功"; + case "3" -> "退票成功"; + default -> orderStatus; + }; + } }