From e46b648749b8ba9cde852b7bc965ef602ca57da4 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 11 九月 2024 10:43:13 +0800
Subject: [PATCH] 修改bug
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index e8e2425..debbc89 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -402,19 +402,19 @@
out.write(JSON.toJSONString(orderPositions));
out.flush();
out.close();
- //计算里程
- //5分钟
- if(counts > 60){
+
+
+ //获取预估里程，使用预估里程作为行驶里程计算金额
+ String origins = orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat();
+ String destination = orderPrivateCar.getGetoffLon() + "," + orderPrivateCar.getGetoffLat();
+ Map<String, String> distance = gdMapElectricFenceUtil.getDistance(origins, destination, 1);
+ Double distance1 = Double.valueOf(distance.get("distance"));
+ if(distance1 - sum > 1000){
+ orderPrivateCar.setMileage(distance1);
+ orderPrivateCar.setIsAbnormal(1);
+ }else{
orderPrivateCar.setMileage(sum);
orderPrivateCar.setIsAbnormal(0);
- }else{
- //获取预估里程，使用预估里程作为行驶里程计算金额
- String origins = orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat();
- String destination = orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat();
- Map<String, String> distance = gdMapElectricFenceUtil.getDistance(origins, destination, 1);
- String distance1 = distance.get("distance");
- orderPrivateCar.setMileage(Double.valueOf(distance1));
- orderPrivateCar.setIsAbnormal(1);
}
break;
}
--
Gitblit v1.7.1