From b58aa9e68a30029423c57886a0a30896d833cb44 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 10 八月 2023 10:13:47 +0800
Subject: [PATCH] 合并代码
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
index 8c6a2bd..00b1cd2 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
@@ -48,7 +48,11 @@
@Override
public void saveOrderPosition(DriverPositionWarpper driverPositionWarpper) throws Exception {
Integer orderId = driverPositionWarpper.getOrderId();
+ Integer driverId = driverPositionWarpper.getDriverId();
Order order = orderService.selectById(orderId);
+ if(null == order.getDriverId() || order.getDriverId().compareTo(driverId) != 0){
+ return;
+ }
if(order.getState() != 105 && order.getState() != 401){
return;
}
@@ -136,7 +140,7 @@
}
}
- if(50 >= wgs84 && 3 <= (null == num ? 0 : num)){//20秒（5秒上传一次数据）
+ if(50 >= wgs84 && 6 <= (null == num ? 0 : num)){//30秒（5秒上传一次数据）
Integer integer = map.get(order.getId().toString());
map.put(order.getId().toString(), null == integer ? 0 : integer + 1);
//进入等待状态
@@ -152,7 +156,7 @@
e.printStackTrace();
}
}
- if(50 >= wgs84 && 3 > (null == num ? 0 : num)){
+ if(50 >= wgs84 && 6 > (null == num ? 0 : num)){
Integer integer = map.get(order.getId().toString());
map.put(order.getId().toString(), null == integer ? 0 : integer + 1);
}
--
Gitblit v1.7.1