From 7454b6532cd2a5c68235a45f1cc540e25f1ffaf4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 四月 2023 18:40:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 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 8184384..3fded99 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
@@ -103,8 +103,16 @@
         if(50 >= wgs84 && 12 <= (null == num ? 0 : num)){//1分钟(5秒上传一次数据)
             Integer integer = map.get(order.getId().toString());
             map.put(order.getId().toString(), integer++);
-            order.setState(401);//进入等待状态
-            order.setStartWaitTime(new Date());
+            //进入等待状态
+            ProcessOperationsWarpper processOperationsWarpper = new ProcessOperationsWarpper();
+            processOperationsWarpper.setOrderId(order.getId());
+            processOperationsWarpper.setState(401);
+            try {
+                orderService.driverProcessOperations(order.getDriverId(), processOperationsWarpper);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
         }
         if(50 >= wgs84 && 12 > (null == num ? 0 : num)){
             Integer integer = map.get(order.getId().toString());

--
Gitblit v1.7.1