修改经纬度

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -338,10 +338,10 @@ public class WaybillOrderService {
         orderResp.setUnloadAddress(takeAddress.getDetailAddress());
         //装卸地之间距离
         double distanceKm = DistanceUtils.calculateDistance(
-                Optional.ofNullable(shipmentAddress.getLat()).map(Double::valueOf).orElse(null),
                 Optional.ofNullable(shipmentAddress.getLng()).map(Double::valueOf).orElse(null),
-                Optional.ofNullable(takeAddress.getLat()).map(Double::valueOf).orElse(null),
-                Optional.ofNullable(takeAddress.getLng()).map(Double::valueOf).orElse(null));
+                Optional.ofNullable(shipmentAddress.getLat()).map(Double::valueOf).orElse(null),
+                Optional.ofNullable(takeAddress.getLng()).map(Double::valueOf).orElse(null),
+                Optional.ofNullable(takeAddress.getLat()).map(Double::valueOf).orElse(null));
         orderResp.setDistanceKm(distanceKm);
 
         //时间
@@ -694,10 +694,10 @@ public class WaybillOrderService {
         wbOrderResp.setUnloadLat(takeAddress.getLat());
         //装卸地之间距离
         double distanceKm = DistanceUtils.calculateDistance(
-                Optional.ofNullable(shipmentAddress.getLat()).map(Double::valueOf).orElse(null),
                 Optional.ofNullable(shipmentAddress.getLng()).map(Double::valueOf).orElse(null),
-                Optional.ofNullable(takeAddress.getLat()).map(Double::valueOf).orElse(null),
-                Optional.ofNullable(takeAddress.getLng()).map(Double::valueOf).orElse(null));
+                Optional.ofNullable(shipmentAddress.getLat()).map(Double::valueOf).orElse(null),
+                Optional.ofNullable(takeAddress.getLng()).map(Double::valueOf).orElse(null),
+                Optional.ofNullable(takeAddress.getLat()).map(Double::valueOf).orElse(null));
         wbOrderResp.setDistanceKm(distanceKm);
 
         //皮重