From 40eeb75963471107c6059b8d041c2c0745502d52 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 26 七月 2025 10:03:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 281eb40..332558f 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -2500,7 +2500,7 @@
                     }
                     Company query = companyCityService.query(String.valueOf(orderPrivateCar.getStartLon()), String.valueOf(orderPrivateCar.getStartLat()));//获取起点所属分公司
                     List<PushOrder> querys = pushOrderService.querys(null, 1, query.getId());//获取需要推送的次数
-                    for(int i = 1; i <= querys.size(); i++){
+                    for(int i = 1; i <= querys.size()+5; i++){
                         OrderPrivateCar orderPrivateCar = orderPrivateCarMapper.selectById(id);
                         if (null == orderPrivateCar || orderPrivateCar.getState() > 1) {
                             break;
@@ -2542,7 +2542,7 @@
                                 orderIds.remove(orderPrivateCar.getId());
                                 return;
                             }
-                            if (i == querys.size() && state == 1) {
+                            if (i == querys.size()+5 && state == 1) {
                                 pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1);
                                 orderIds.remove(orderPrivateCar.getId());
                             }
@@ -2584,7 +2584,7 @@
                 endPushWarpper.setState(1);
                 List<PushOrder> querys = pushOrderService.querys(null, 2, orderPrivateCar.getCompanyId());//获取需要推送的次数
                 int time = 0;
-                for(int i = 1; i <= querys.size(); i++){
+                for(int i = 1; i <= querys.size()+5; i++){
                     PushOrder pushOrder = pushOrderService.querys(i, 2, orderPrivateCar.getCompanyId()).get(0);
                     time += pushOrder.getPushTime() * 1000;
                 }

--
Gitblit v1.7.1