From c019466850fb73c1934eea18252eda70383d8c90 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 2 Jan 2025 17:02:33 +0800
Subject: [PATCH] =?UTF-8?q?[6.9.0]=20[fix]=20[taxi]=20[taxi=20=E8=99=9A?=
 =?UTF-8?q?=E6=8B=9F=E5=8D=95=E6=B7=BB=E5=8A=A0taskid]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt    | 1 +
 .../com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt  | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt
index ee1c468556..3e5a5bc41a 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt
@@ -92,6 +92,7 @@ data class QueryCurrentTaskRespBean(var data: Result?) : BaseData() {
     data class Result(
         var sn: String,
         var lineId: Long,
+        var taskId: Long,
         var servingStatus: Int,
         var currentStatus: Int,
         var taskType: Int,
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt
index 290e846457..e0991e07dc 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt
@@ -23,6 +23,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListener
 import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager
 import com.mogo.eagle.core.function.call.unmanned.CallerUnmannedListenerManager
 import com.mogo.eagle.core.network.utils.GsonUtil
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
@@ -1090,11 +1091,17 @@ object TaxiTaskModel {
                             if(endStaion!=null){
                                 temp.add(endStaion)
                             }
+                            val orderId =  if(mCurrentTaskWithOrder?.order!=null){
+                                mCurrentTaskWithOrder?.order?.orderNo?:""
+                            }else{
+                                mCurrentTaskWithOrder?.taskId?.toString()
+                            }
+                            CallerLogger.d(TAG,"任务信息：-----orderId:${orderId}")
                             LineManager.setLineInfo(
                                 LineInfo(
                                     traj.lineId,
                                     traj.lineName,
-                                    orderId = mCurrentTaskWithOrder?.order?.orderNo?:"",
+                                    orderId = orderId,
                                     siteInfos = temp
                                 )
                             )