修改

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CarrierInfoServiceImpl.java

@@ -54,6 +54,8 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
     private IDriverCarInfoService driverCarInfoService;
     @Autowired
     private IHyTokenService hyToken;
+    @Autowired
+    private IPublishTaskInfoService publishTaskInfoService;
 
     /**
      * 查看装车信息
@@ -122,8 +124,13 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
                     BigDecimal latResult = jsonArray.getBigDecimal("lat");
                     Double lat = latResult.doubleValue() / 600000;
                     //发货地经纬度
-                    Double lon1 = Double.parseDouble(hyCarrierInfo.getLoadingLongitude());
-                    Double lat1 = Double.parseDouble(hyCarrierInfo.getLoadingLatitude());
+                    //查询发货地经纬度
+                    OrderInfo orderInfo1 = orderInfoService.selectOne(new EntityWrapper<OrderInfo>()
+                            .eq("id", hyCarrierInfo1.getOrderId())
+                            .eq("delete_flag", "0"));
+                    PublishTaskInfo publishTaskInfo = publishTaskInfoService.selectById(orderInfo1.getTaskId());
+                    Double lon1 = Double.parseDouble(publishTaskInfo.getSendLongitude());
+                    Double lat1 = Double.parseDouble(publishTaskInfo.getSendLatitude());
                     System.out.println("发货经纬度:" + lon1+","+lat1);
                      // 距离
                     double s = GetDistance(lon,lat,lon1,lat1);