From 818937959bb19d3669585fa87a526bffe9ce77a4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 24 四月 2025 09:28:41 +0800
Subject: [PATCH] 修改默认验证码

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

diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
index 617aecd..259c031 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -233,12 +233,12 @@
             case 2:
                 OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
                 driverId = orderTaxi.getDriverId();
-                startLonLat = orderTaxi.getStartLon() + "," + orderTaxi.getStartLat();
+                startLonLat = orderTaxi.getStartLat() + "," + orderTaxi.getStartLon();
                 state = orderTaxi.getState();
                 oldState = orderTaxi.getOldState();
                 startServiceTime = null != orderTaxi.getStartServiceTime() ? orderTaxi.getStartServiceTime().getTime() : null;
                 servedMileage = orderTaxi.getMileage();
-                endLonLat = orderTaxi.getEndLon() + "," + orderTaxi.getEndLat();
+                endLonLat = orderTaxi.getEndLat() + "," + orderTaxi.getEndLon();
                 break;
             case 3:
                 OrderCrossCity orderCrossCity = orderCrossCityService.selectById(orderId);
@@ -256,6 +256,9 @@
         if(null == value || "".equals(value)){
             System.err.println("司机没有上传位置信息");
         }
+        // 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