From b10977d128dfc77497f1cc33df13d55e8801a3f7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 09:13:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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..3f162df 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,20 +402,22 @@
out.write(JSON.toJSONString(orderPositions));
out.flush();
out.close();
- //计算里程
- //5分钟
- if(counts > 60){
- 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);
- }
+
+ orderPrivateCar.setMileage(sum);
+ orderPrivateCar.setIsAbnormal(0);
+
+ //获取预估里程，使用预估里程作为行驶里程计算金额
+// 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);
+// }
break;
}
this.updateById(orderPrivateCar);
--
Gitblit v1.7.1