From 73147c6034c1c67db96eaa8d76fdf86104a5a2ce Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 六月 2025 09:41:19 +0800
Subject: [PATCH] bug修改

---
 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
index 813f4fd..c861635 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -258,12 +258,12 @@
                     this.removeTask(orderId, orderType);
                 }else{
                     driverId = orderPrivateCar.getDriverId();
-                    startLonLat = orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat();
+                    startLonLat = orderPrivateCar.getStartLat() + "," + orderPrivateCar.getStartLon();
                     state = orderPrivateCar.getState();
                     oldState = orderPrivateCar.getOldState();
                     startServiceTime = null != orderPrivateCar.getStartServiceTime() ? orderPrivateCar.getStartServiceTime().getTime() : null;
                     servedMileage = orderPrivateCar.getMileage();
-                    endLonLat = orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat();
+                    endLonLat = orderPrivateCar.getEndLat() + "," + orderPrivateCar.getEndLon();
                 }
                 break;
             case 2:
@@ -326,6 +326,9 @@
             System.err.println("司机没有上传位置信息");
             return;
         }
+        // todo 注意 因更换地图为百度 两者lon和lat位置互换了
+        String[] split = value.split(",");
+        value = split[1] + "," + split[0];
         Map<String, String> distance = gdMapElectricFenceUtil.getDistance(value, startLonLat, 1);
         String d = "0";
         String t = "0";

--
Gitblit v1.7.1