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)