代码优化

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/AirportOrderStrategy.java

@@ -10,7 +10,9 @@ import org.dromara.order.api.enums.FeeType;
 import org.dromara.server.service.IOrderStrategy;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 机场订单策略
@@ -31,22 +33,22 @@ public class AirportOrderStrategy implements IOrderStrategy {
         // 保险金额
         RemoteSaveOrder.Fee insuranceFee = new RemoteSaveOrder.Fee()
             .setFeeDesc("保险费")
-            .setFeeAmount(detail.getInsureAmount())
+            .setFeeAmount(Optional.ofNullable(detail.getInsureAmount()).orElse(BigDecimal.ZERO))
             .setFeeType(FeeType.INSURANCE_FEE);
         //服务费
         RemoteSaveOrder.Fee serviceFee = new RemoteSaveOrder.Fee()
             .setFeeDesc("服务费")
-            .setFeeAmount(detail.getServiceFee())
+            .setFeeAmount(Optional.ofNullable(detail.getServiceFee()).orElse(BigDecimal.ZERO))
             .setFeeType(FeeType.CLOUD_SERVICE_FEE);
         //燃油费
         RemoteSaveOrder.Fee fuelFee = new RemoteSaveOrder.Fee()
             .setFeeDesc("燃油费")
-            .setFeeAmount(detail.getTax())
+            .setFeeAmount(Optional.ofNullable(detail.getTax()).orElse(BigDecimal.ZERO))
             .setFeeType(FeeType.FUEL_FEE);
         //飞机票费
         RemoteSaveOrder.Fee planeTicket = new RemoteSaveOrder.Fee()
             .setFeeDesc("飞机票")
-            .setFeeAmount(detail.getSalePrice())
+            .setFeeAmount(Optional.ofNullable(detail.getSalePrice()).orElse(BigDecimal.ZERO))
             .setFeeType(FeeType.AIRPLANE_TICKET_FEE);
         return new RemoteSaveOrder()
             .setFeeList(List.of(insuranceFee, serviceFee, fuelFee, planeTicket));

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/CarOrderStrategy.java

@@ -10,7 +10,9 @@ import org.dromara.order.api.enums.FeeType;
 import org.dromara.server.service.IOrderStrategy;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 用车订单策略
@@ -31,17 +33,17 @@ public class CarOrderStrategy implements IOrderStrategy {
         // 罚金
         RemoteSaveOrder.Fee fineFee = new RemoteSaveOrder.Fee()
             .setFeeDesc("罚金")
-            .setFeeAmount(detail.getFine())
+            .setFeeAmount(Optional.ofNullable(detail.getFine()).orElse(BigDecimal.ZERO))
             .setFeeType(FeeType.CAR_FINE);
         //服务费
         RemoteSaveOrder.Fee serviceFee = new RemoteSaveOrder.Fee()
             .setFeeDesc("服务费")
-            .setFeeAmount(detail.getServiceFee())
+            .setFeeAmount(Optional.ofNullable(detail.getServiceFee()).orElse(BigDecimal.ZERO))
             .setFeeType(FeeType.CLOUD_SERVICE_FEE);
         //火车票费
         RemoteSaveOrder.Fee carFee = new RemoteSaveOrder.Fee()
             .setFeeDesc("用车费")
-            .setFeeAmount(detail.getUseVehicleFee())
+            .setFeeAmount(Optional.ofNullable(detail.getUseVehicleFee()).orElse(BigDecimal.ZERO))
             .setFeeType(FeeType.CAR_FEE);
         return new RemoteSaveOrder()
             .setFeeList(List.of(fineFee, serviceFee, carFee));

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/HotelOrderStrategy.java

@@ -10,7 +10,9 @@ import org.dromara.order.api.enums.FeeType;
 import org.dromara.server.service.IOrderStrategy;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 酒店订单策略
@@ -31,12 +33,12 @@ public class HotelOrderStrategy implements IOrderStrategy {
         // 保险金额
         RemoteSaveOrder.Fee hotelFee = new RemoteSaveOrder.Fee()
             .setFeeDesc("房费")
-            .setFeeAmount(detail.getSalePrice())
+            .setFeeAmount(Optional.ofNullable(detail.getSalePrice()).orElse(BigDecimal.ZERO))
             .setFeeType(FeeType.INSURANCE_FEE);
         //服务费
         RemoteSaveOrder.Fee serviceFee = new RemoteSaveOrder.Fee()
             .setFeeDesc("服务费")
-            .setFeeAmount(detail.getServiceFee())
+            .setFeeAmount(Optional.ofNullable(detail.getServiceFee()).orElse(BigDecimal.ZERO))
             .setFeeType(FeeType.CLOUD_SERVICE_FEE);
         return new RemoteSaveOrder()
             .setFeeList(List.of(hotelFee, serviceFee));

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/TrainOrderStrategy.java

@@ -11,7 +11,9 @@ import org.dromara.order.api.enums.FeeType;
 import org.dromara.server.service.IOrderStrategy;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 火车票订单策略
@@ -32,17 +34,17 @@ public class TrainOrderStrategy implements IOrderStrategy {
         // 保险金额
         RemoteSaveOrder.Fee insuranceFee = new RemoteSaveOrder.Fee()
             .setFeeDesc("保险费")
-            .setFeeAmount(detail.getInsureAmount())
+            .setFeeAmount(Optional.ofNullable(detail.getInsureAmount()).orElse(BigDecimal.ZERO))
             .setFeeType(FeeType.HOTEL_FEE);
         //服务费
         RemoteSaveOrder.Fee serviceFee = new RemoteSaveOrder.Fee()
             .setFeeDesc("服务费")
-            .setFeeAmount(detail.getServiceChargePrice())
+            .setFeeAmount(Optional.ofNullable(detail.getServiceChargePrice()).orElse(BigDecimal.ZERO))
             .setFeeType(FeeType.CLOUD_SERVICE_FEE);
         //火车票费
         RemoteSaveOrder.Fee railTicket = new RemoteSaveOrder.Fee()
             .setFeeDesc("火车票费")
-            .setFeeAmount(detail.getTicketPrice())
+            .setFeeAmount(Optional.ofNullable(detail.getTicketPrice()).orElse(BigDecimal.ZERO))
             .setFeeType(FeeType.RAIL_TICKET_FEE);
         return new RemoteSaveOrder()
             .setFeeList(List.of(insuranceFee, serviceFee, railTicket));