From 7b3c5a3c8403c3fe11734c198c3f4dc01c59b986 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 23 八月 2024 16:44:01 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index 867f558..40a2a35 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -351,12 +351,12 @@
             new Thread(new Runnable() {
                 @Override
                 public void run() {
+                    pushUtil.frozenOrder(finalOrderPrivateCar.getDriverId(),2);
                     pushUtil.pushOrderState(2, finalOrderPrivateCar.getDriverId(), finalOrderPrivateCar.getId(), 1, 7, 0, "");
                 }
             }).start();
         }
         orderPrivateCar.setIsFrozen(orderPrivateCar.getIsFrozen()==1?2:1);
-        orderPrivateCar.setState(7);
         tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);
 
         return SUCCESS_TIP;

--
Gitblit v1.7.1