From f3106694f7f9992391b26897571ff11462cfe475 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 18 九月 2025 10:27:03 +0800
Subject: [PATCH] 修改bug
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
index 311247e..759821b 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -808,8 +808,9 @@
for (int j = 0; j < 6; j++) {
Boolean push = false;
for (int i = 1; i <= querys.size(); i++) {
+ num++;
int finalI = i;
- PushOrder pushOrder = querys.stream().filter(s -> s.getType() == (finalI <= 3 ? finalI : 3)).findFirst().orElse(null);
+ PushOrder pushOrder = querys.stream().filter(s -> s.getType() == finalI).findFirst().orElse(null);
System.out.println("pushOrder:" + pushOrder);
//获取空闲司机
List<Driver> list = driverService.queryIdleDriver(2, orderTaxi.getStartLon(), orderTaxi.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
@@ -837,7 +838,7 @@
}
Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
Integer state = orderTaxi1.getState();
- if (state != 1 || state!= 11) {
+ if (state != 1 && state != 11) {
orderIds.remove(orderTaxi.getId());
push = true;
break;
--
Gitblit v1.7.1