From 9eadadef992990ada8fbadb068bcaa110c501bb7 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Wed, 6 Sep 2023 20:37:18 +0800 Subject: [PATCH] =?UTF-8?q?[Taxi=E6=97=A0=E4=BA=BA=E5=8C=96]=20refactor:?= =?UTF-8?q?=20=E4=B9=98=E5=AE=A2=E5=B1=8F=E8=BD=A8=E8=BF=B9lineId=E4=BD=BF?= =?UTF-8?q?=E7=94=A8order=E4=B8=AD=E4=BF=A1=E6=81=AF=EF=BC=8C=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E6=9C=AC=E5=9C=B0=E8=AE=A1=E7=AE=97=E8=B7=9D=E7=A6=BB?= =?UTF-8?q?=E5=92=8C=E6=97=B6=E9=97=B4=E6=97=B6=20=E8=B5=B7=E7=BB=88?= =?UTF-8?q?=E7=82=B9=E5=92=8ClindId=E4=BB=8E=E4=B8=8D=E5=90=8C=E5=9C=B0?= =?UTF-8?q?=E6=96=B9=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/TaxiPassengerOrdersInServiceQueryRespBean.java | 2 ++ .../mogo/och/taxi/passenger/model/TaxiPassengerModel.kt | 2 +- .../passenger/network/TaxiPassengerServiceManager.kt | 9 ++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java index 59847c1c65..a0f9b9d8f1 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java @@ -55,6 +55,8 @@ public class TaxiPassengerOrdersInServiceQueryRespBean extends BaseData { public SiteBean orderEndSite;//站点-终点 public List planningLines;//预加载的line + public Long orderLine;//送驾的lineId + @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt index 8320f4bc6a..31a50adadc 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt @@ -204,7 +204,7 @@ object TaxiPassengerModel { if (data.data != null && data.data.order != null) { // 1.1. 当存在进行中单时：对本地currentOrder进行更新 val currentOrder = data.data.order - currentLineId = data.data.lineId + currentLineId = data.data.order.orderLine currentTrajectoryInfo = data.data.trajectoryInfoByQuery if (currentOCHOrder == null) { currentOCHOrder = currentOrder diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt index 330ee4ba1f..aa9ae27782 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt @@ -71,14 +71,13 @@ object TaxiPassengerServiceManager { mOCHTaxiServiceApi.queryOrdersInAndWaitService(sn = driverSn) //获取到司机端的sn .flatMap { ordersInServiceQueryResp: TaxiPassengerOrdersInServiceQueryRespBean -> if (ordersInServiceQueryResp.data == null - || ordersInServiceQueryResp.data.lineId == -1L + || ordersInServiceQueryResp.data.order == null + || ordersInServiceQueryResp.data.order.orderLine == null ) { - if (ordersInServiceQueryResp.data != null) { - ordersInServiceQueryResp.data.trajectoryInfoByQuery = null - } + ordersInServiceQueryResp?.data?.trajectoryInfoByQuery = null return@flatMap Observable.just(ordersInServiceQueryResp) } - val lineId = ordersInServiceQueryResp.data.lineId + val lineId = ordersInServiceQueryResp.data.order.orderLine return@flatMap mOCHTaxiServiceApi.getTrajectoryInfoByLineIds(lineIds = listOf(lineId)) .map { trajectoryInfoResp: TaxiPassengerGetTrajectoryByLineIdRespBean? -> val lineInfoByQuery = trajectoryInfoResp?.getTrajectoryInfoByLineId(lineId)