From fb4902cf37252a3e47a7b7f49542b3b627f5b2d9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 15:30:24 +0800
Subject: [PATCH] 修改bug

---
 driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java b/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
index d5aeb9f..9fbc7e8 100644
--- a/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
@@ -48,6 +48,10 @@
     @Override
     public void saveOrderPosition(DriverPositionWarpper driverPositionWarpper) throws Exception {
         Integer orderId = driverPositionWarpper.getOrderId();
+        Order order = orderService.selectById(orderId);
+        if(order.getState() != 105){
+            return;
+        }
         Integer orderType = driverPositionWarpper.getOrderType();
         File file = new File(filePath + orderId + ".json");
         if(!file.exists()){
@@ -99,7 +103,7 @@
         Order order = orderService.selectById(driverPositionWarpper.getOrderId());
         Double wgs84 = distance.get("WGS84");
         Integer num = map.get(order.getId().toString());
-        if(50 < wgs84){
+        if(100 < wgs84){
             order.setActualMileage(order.getActualMileage() + wgs84.intValue());
             orderService.updateById(order);
             map.put(order.getId().toString(), 0);
@@ -115,7 +119,7 @@
                 }
             }
         }
-        if(50 >= wgs84 && 12 <= (null == num ? 0 : num)){//1分钟(5秒上传一次数据)
+        if(100 >= wgs84 && 12 <= (null == num ? 0 : num)){//1分钟(5秒上传一次数据)
             Integer integer = map.get(order.getId().toString());
             map.put(order.getId().toString(), null == integer ? 0 : integer++);
             //进入等待状态
@@ -128,7 +132,7 @@
                 e.printStackTrace();
             }
         }
-        if(50 >= wgs84 && 12 > (null == num ? 0 : num)){
+        if(100 >= wgs84 && 12 > (null == num ? 0 : num)){
             Integer integer = map.get(order.getId().toString());
             map.put(order.getId().toString(), null == integer ? 0 : integer++);
         }

--
Gitblit v1.7.1