From 3ce8d9e9fbe60c9164eb1e385aeca85089163065 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 8 Dec 2022 15:00:01 +0800
Subject: [PATCH] =?UTF-8?q?[2.13.0]bus=E5=8F=B8=E6=9C=BA=E7=AB=AF=E5=88=B0?=
 =?UTF-8?q?=E7=AB=99bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/model/BusOrderModel.java    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
index e46780606e..cd7b5ec790 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
@@ -644,10 +644,15 @@ public class BusOrderModel {
                     @Override
                     public void onSuccess(BaseData o) {
                         CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-arriveSiteStation success");
-                        queryBusRoutes();
-
-                        arriveStationSuccess(arrivedStationIndex, departureStopName, arriveStation);
-
+                        if (o != null && o.code == 0){
+                            queryBusRoutes();
+                            isArrivedStation = true;
+                            isGoingToNextStation = false;
+                            arriveStationSuccess(arrivedStationIndex, departureStopName, arriveStation);
+                        }else {
+                            isArrivedStation = false;
+                            isGoingToNextStation = true;
+                        }
                         //5s轮询核销乘客
 //                        startOrStopQueryPassengerWriteOff(true);
                     }
@@ -1012,13 +1017,10 @@ public class BusOrderModel {
         }
 
         if (isArrivedStation) return;
-        isArrivedStation = true;
 
         CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex="
                 + backgroundCurrentStationIndex);
 
-        isGoingToNextStation = false;
-
         arriveSiteStation();
     }