From c888a5547f9d7b5ca7a04b7c7d0692197b0ec202 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 11 九月 2024 10:28:53 +0800
Subject: [PATCH] 修改bug

---
 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java |   37 ++++++++++++++++++++++++-------------
 1 files changed, 24 insertions(+), 13 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 a1abc83..e8e2425 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
@@ -389,21 +389,32 @@
                         toLonLat = fromLonLat;
                     }
                 }
-                System.err.println("======服务里程======"+sum);
-                if(counts < 5){
+                
+                //存储轨迹
+                // 将数据存储到文件中
+                File file = new File(filePath + orderId + "_" + 1 + ".txt");
+                if(!file.exists()){
+                    file.getParentFile().mkdirs();
+                    file.createNewFile();
+                }
+                //写入相应的文件
+                PrintWriter out = new PrintWriter(new FileWriter(file));
+                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);
-                    // 将数据存储到文件中
-                    File file = new File(filePath + orderId + "_" + 1 + ".txt");
-                    if(!file.exists()){
-                        file.getParentFile().mkdirs();
-                        file.createNewFile();
-                    }
-                    //写入相应的文件
-                    PrintWriter out = new PrintWriter(new FileWriter(file));
-                    out.write(JSON.toJSONString(orderPositions));
-                    out.flush();
-                    out.close();
                 }
                 break;
         }

--
Gitblit v1.7.1