From ddf3c8677400a88363c709433a0032ee1ebe2622 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Tue, 15 Aug 2023 19:47:45 +0800 Subject: [PATCH] =?UTF-8?q?[Taxi=E6=97=A0=E4=BA=BA=E5=8C=96]=20feat:=20?= =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=20=E8=B0=83=E8=AF=95=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java | 4 +++- .../mogo/och/taxi/passenger/model/TaxiPassengerModel.kt | 2 +- .../taxi/passenger/network/TaxiPassengerServiceApi.kt | 2 +- .../passenger/network/TaxiPassengerServiceManager.kt | 9 ++++++++- .../mogo/och/taxi/passenger/ui/check/ChekViewModel.kt | 1 - 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java index b4d6573bf5..c0e94c3bf2 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java @@ -8,9 +8,11 @@ public class TaxiPassengerCheckPhoneUpdateOrderReqBean { public String orderNo; public String phone; + public String sn; - public TaxiPassengerCheckPhoneUpdateOrderReqBean(String orderNo,String phone) { + public TaxiPassengerCheckPhoneUpdateOrderReqBean(String orderNo,String phone, String sn) { this.orderNo = orderNo; this.phone = phone; + this.sn = sn; } } diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt index e05ce7c4a7..2484310e0e 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt @@ -159,7 +159,7 @@ object TaxiPassengerModel { return } //1. 处理进行中订单 - if (data.data != null) { + if (data.data != null && data.data.order != null) { // 1.1. 当存在进行中单时：对本地currentOrder进行更新 val currentOrder = data.data.order currentLineId = data.data.lineId diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt index eab97f59a7..2b4764eca9 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt @@ -43,7 +43,7 @@ internal interface TaxiPassengerServiceApi { fun getTrajectoryInfoByLineIds( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, - @Query("lineIds") lineIds: List + @Body lineIds: List ):Observable diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt index fe096c17c4..bad03776c5 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt @@ -17,6 +17,7 @@ import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryReqBean import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean import com.mogo.och.taxi.passenger.bean.TaxiPassengerStartReqBean +import io.reactivex.Observable /** * Created by pangfan on 2021/8/19 @@ -69,6 +70,11 @@ object TaxiPassengerServiceManager { } mOCHTaxiServiceApi.queryOrdersInAndWaitService(sn = driverSn) //获取到司机端的sn .flatMap { ordersInServiceQueryResp: TaxiPassengerOrdersInServiceQueryRespBean -> + if (ordersInServiceQueryResp.data == null + || ordersInServiceQueryResp.data.lineId == -1L + ) { + return@flatMap Observable.just(ordersInServiceQueryResp) + } val lineId = ordersInServiceQueryResp.data.lineId return@flatMap mOCHTaxiServiceApi.getTrajectoryInfoByLineIds(lineIds = listOf(lineId)) .map { trajectoryInfoResp: TaxiPassengerGetTrajectoryByLineIdRespBean? -> @@ -90,7 +96,8 @@ object TaxiPassengerServiceManager { mOCHTaxiServiceApi.checkPhoneAndUpdateOrderStatus( data = TaxiPassengerCheckPhoneUpdateOrderReqBean( orderNo, - phone + phone, + driverSn ) ) .transformTry() diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/ChekViewModel.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/ChekViewModel.kt index 2e2efd99b7..110eb8a90f 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/ChekViewModel.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/ChekViewModel.kt @@ -24,7 +24,6 @@ class ChekViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallback { TaxiPassengerModel.checkPhoneAndUpdateStatus(phone) } - private fun setOrderInfo() { val currentOCHOrder = TaxiPassengerModel.currentOCHOrder currentOCHOrder?.let { order ->