chenxiaofei 1 месяц назад
Родитель
Сommit
c7f583119d

+ 3 - 3
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -2606,10 +2606,10 @@ public class KwtLogisticsConsignmentService {
         loadingInfoVO.setUnloadContacts(unloadAdd.getContacts());
         loadingInfoVO.setUnloadContacts(unloadAdd.getContacts());
         loadingInfoVO.setUnloadPhone(unloadAdd.getPhone());
         loadingInfoVO.setUnloadPhone(unloadAdd.getPhone());
         double distanceKm = DistanceUtils.calculateDistance(
         double distanceKm = DistanceUtils.calculateDistance(
-                Optional.ofNullable(loadAdd.getLat()).map(Double::valueOf).orElse(null),
                 Optional.ofNullable(loadAdd.getLng()).map(Double::valueOf).orElse(null),
                 Optional.ofNullable(loadAdd.getLng()).map(Double::valueOf).orElse(null),
-                Optional.ofNullable(unloadAdd.getLat()).map(Double::valueOf).orElse(null),
-                Optional.ofNullable(unloadAdd.getLng()).map(Double::valueOf).orElse(null));
+                Optional.ofNullable(loadAdd.getLat()).map(Double::valueOf).orElse(null),
+                Optional.ofNullable(unloadAdd.getLng()).map(Double::valueOf).orElse(null),
+                Optional.ofNullable(unloadAdd.getLat()).map(Double::valueOf).orElse(null));
         loadingInfoVO.setReferenceDistance(String.valueOf(distanceKm));
         loadingInfoVO.setReferenceDistance(String.valueOf(distanceKm));
         logisticsOrderDetailResp.setLoadingInfoVO(loadingInfoVO);
         logisticsOrderDetailResp.setLoadingInfoVO(loadingInfoVO);
     }
     }