From 574cd41b6e4aa65426c7597297aa94f6259d6666 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 18:57:26 +0800
Subject: [PATCH] 修改bug

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

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index b916a87..e410adc 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -572,7 +572,7 @@
                     }
                     OpenCity openCity = openCityService.openCity1(orderLogistics.getStartLon().toString(), orderLogistics.getStartLat().toString());
                     List<PushOrder> querys = pushOrderService.querys(null, 1, openCity.getId());//用专车的推单配置
-                    for(int i = 1; i <= querys.size() + 5; i++){
+                    for(int i = 1; i <= querys.size() + 15; i++){
 //                        OrderLogistics orderLogistics = orderLogisticsMapper.selectById(id);
 //                        if (null == orderLogistics || orderLogistics.getState() > 1) {
 //                            break;
@@ -616,7 +616,7 @@
                                 orderIds.remove(orderLogistics.getId());
                                 return;
                             }
-                            if (i == querys.size() + 5 && state == 1) {
+                            if (i == querys.size() + 15 && state == 1) {
                                 orderIds.remove(orderLogistics.getId());
                             }
                         }
@@ -1149,7 +1149,7 @@
             return ResultUtil.error("取消订单失败,订单信息有误");
         }
         if(orderLogistics.getState() >= 5 && orderLogistics.getState() != 7 && orderLogistics.getState() != 8  && orderLogistics.getState() != 11){
-            return ResultUtil.error("取消订单失败,不合法的操作");
+            return ResultUtil.error("订单已取消,请刷新页面");
         }
 
         if(orderLogistics.getState() == 7){

--
Gitblit v1.7.1