From 4ef5e1e6b073508964dfb378053d178de63860bb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 28 八月 2025 16:10:14 +0800
Subject: [PATCH] 8.22后台
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index e45ac73..3a78bd9 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -371,12 +371,12 @@
break;
case 3://城际
map = orderCrossCityService.queryPushOrder(orderId);
- String order2 = String.valueOf(map.get("startLon")) + "," + String.valueOf(map.get("startLat"));
- String distance2 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, order2, 1).get("distance");
+ String order2 = String.valueOf(map.get("startLat")) + "," +String.valueOf(map.get("startLon"));
+ String distance2 = gdMapElectricFenceUtil.getDistance(lat + "," + lon, order2, 1).get("distance");
map.put("startDistance", ToolUtil.isNotEmpty(distance2) ? Double.valueOf(distance2) / 1000 : 0);
//总距离
- String end2 = String.valueOf(map.get("endLon")) + "," + String.valueOf(map.get("endLat"));
+ String end2 =String.valueOf(map.get("endLat")) + "," + String.valueOf(map.get("endLon")) ;
distance = gdMapElectricFenceUtil.getDistance(end2, order2, 1).get("distance");
map.put("totalDistance", ToolUtil.isNotEmpty(distance) ? Double.valueOf(distance) / 1000 : 0);
@@ -400,8 +400,8 @@
break;
case 4://同城小件物流
map = orderLogisticsService.queryPushOrder(orderId);
- String order3 = String.valueOf(map.get("startLon")) + "," + String.valueOf(map.get("startLat"));
- String distance3 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, order3, 1).get("distance");
+ String order3 = String.valueOf(map.get("startLat")) + "," + String.valueOf(map.get("startLon")) ;
+ String distance3 = gdMapElectricFenceUtil.getDistance(lat + "," + lon, order3, 1).get("distance");
map.put("startDistance", ToolUtil.isNotEmpty(distance3) ? Double.valueOf(distance3) / 1000 : 0);
//总距离
@@ -479,7 +479,7 @@
case 2://出租
return orderTaxiService.grabOrder(orderId, uid);
case 3://城际
- return ResultUtil.success();//不作任何操作，跨城默认选择的司机
+ return orderCrossCityService.grabOrder(orderId, uid);
case 4://同城小件
return orderLogisticsService.grabOrder(orderId, uid);
case 5://跨城小件
@@ -507,7 +507,7 @@
case 2://出租
return orderTaxiService.grabOrder_(orderId, uid);
case 3://城际
- break;
+ return orderCrossCityService.grabOrder(orderId, uid);
case 4://同城小件
return orderLogisticsService.grabOrder_(orderId, uid);
case 5://跨城小件
--
Gitblit v1.7.1