同步代码

src/main/java/com/chint/application/dtos/response/LocationRes.java

@@ -15,6 +15,9 @@ public class LocationRes {
     private String province;
 
     public static LocationRes copyFrom(Location location) {
+        if (location == null) {
+            return null;
+        }
         LocationRes locationRes = BeanUtil.copyProperties(location, LocationRes.class);
         String[] parts = location.getLocationPathName().split("_");
         if (parts.length != 4) {

src/main/java/com/chint/application/queryies/OrderQuery.java

@@ -232,23 +232,29 @@ public class OrderQuery {
                     CityEntity destinationCity;
                     ScheduleDetail.ScheduleDetailBuilder scheduleDetailBuilder = ScheduleDetail.builder();
                     if (!leg.getLegType().equals(LegConstant.LEG_TYPE_OTHER)) {
+
+                        if (leg.getOriginLocation() != null) {
                             originCity = cityEntities.stream().filter(cityEntity -> cityEntity
                                             .getCityName()
                                             .equals(leg.getOriginLocation().getLocationName()))
                                     .findFirst().get();
+                            scheduleDetailBuilder
+                                    .startCity(originCity.getCityName())
+                                    .startCityName(originCity.getCityName())
+                                    .startCityEnName(originCity.getCityename());
+                        }
+
+                        if (leg.getDestinationLocation() != null) {
                             destinationCity = cityEntities.stream().filter(cityEntity -> cityEntity
                                             .getCityName()
                                             .equals(leg.getDestinationLocation().getLocationName()))
                                     .findFirst().get();
-
                             scheduleDetailBuilder
-                                .startCity(originCity.getCityName())
-                                .startCityName(originCity.getCityName())
-                                .startCityEnName(originCity.getCityename())
                                     .endCityName(destinationCity.getCityName())
                                     .endCity(destinationCity.getCityName())
                                     .endCityEnName(destinationCity.getCityename());
                         }
+                    }
 
                     if (leg.getCurrencyType() != null) {
                         scheduleDetailBuilder

src/main/java/com/chint/domain/aggregates/order/Leg.java

@@ -85,9 +85,7 @@ public class Leg {
     }
 
     public Leg queryEstimateAmount(EstimateAdapter estimateAdapter, String supplierName) {
-        if (this.getLegType().equals(LEG_TYPE_OTHER) || this.getLegType().equals(LEG_TYPE_TAXI)) {
+        if (!this.getLegType().equals(LEG_TYPE_OTHER) && !this.getLegType().equals(LEG_TYPE_TAXI)) {
-
-        } else {
             this.estimateAmount = estimateAdapter.of(supplierName).amountEstimate(this);
         }
         return this;