提交 10b339a4 authored 作者: hzh's avatar hzh

bug修复

上级 ea56b05f
...@@ -15,6 +15,8 @@ public enum FeeType { ...@@ -15,6 +15,8 @@ public enum FeeType {
INSURANCE_FEE("INSURANCE_FEE", "保险费"), INSURANCE_FEE("INSURANCE_FEE", "保险费"),
//燃油费 //燃油费
FUEL_FEE("FUEL_FEE", "燃油费"), FUEL_FEE("FUEL_FEE", "燃油费"),
//基建费
INFRASTRUCTURE_FEE("INFRASTRUCTURE_FEE", "基建费"),
//云上服务费 //云上服务费
CLOUD_SERVICE_FEE("CLOUD_SERVICE_FEE", "云上服务费"), CLOUD_SERVICE_FEE("CLOUD_SERVICE_FEE", "云上服务费"),
//飞机票费 //飞机票费
......
...@@ -45,12 +45,17 @@ public class AirportOrderStrategy implements IOrderStrategy { ...@@ -45,12 +45,17 @@ public class AirportOrderStrategy implements IOrderStrategy {
.setFeeDesc("燃油费") .setFeeDesc("燃油费")
.setFeeAmount(Optional.ofNullable(detail.getTax()).orElse(BigDecimal.ZERO)) .setFeeAmount(Optional.ofNullable(detail.getTax()).orElse(BigDecimal.ZERO))
.setFeeType(FeeType.FUEL_FEE); .setFeeType(FeeType.FUEL_FEE);
//基建费
RemoteSaveOrder.Fee constructionFee = new RemoteSaveOrder.Fee()
.setFeeDesc("基建费")
.setFeeAmount(Optional.ofNullable(detail.getAirportFee()).orElse(BigDecimal.ZERO))
.setFeeType(FeeType.INFRASTRUCTURE_FEE);
//飞机票费 //飞机票费
RemoteSaveOrder.Fee planeTicket = new RemoteSaveOrder.Fee() RemoteSaveOrder.Fee planeTicket = new RemoteSaveOrder.Fee()
.setFeeDesc("飞机票") .setFeeDesc("飞机票")
.setFeeAmount(Optional.ofNullable(detail.getSalePrice()).orElse(BigDecimal.ZERO)) .setFeeAmount(Optional.ofNullable(detail.getSalePrice()).orElse(BigDecimal.ZERO))
.setFeeType(FeeType.AIRPLANE_TICKET_FEE); .setFeeType(FeeType.AIRPLANE_TICKET_FEE);
return new RemoteSaveOrder() return new RemoteSaveOrder()
.setFeeList(List.of(insuranceFee, serviceFee, fuelFee, planeTicket)); .setFeeList(List.of(insuranceFee, serviceFee, fuelFee, constructionFee, planeTicket));
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论