diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt
index 8bcfdb3a8f..b0741feea9 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt
@@ -25,6 +25,7 @@ import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffMsg
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
 import com.mogo.och.weaknet.bean.WriteOffPassenger
+import com.mogo.och.weaknet.repository.RepositoryManager
 import com.mogo.och.weaknet.repository.net.shuttlesaas.ShuttleSaasServiceManager
 import com.mogo.och.weaknet.util.ShuttleVoiceManager
 import io.reactivex.Observable
@@ -54,7 +55,7 @@ object TicketModel : IOchOnMessageListener<WriteOffPassenger>{
 
     fun load(){
         // 3s轮训站点核销人数
-        if(ProjectUtils.isDali()) {
+        if(!ProjectUtils.isMogo()) {
             BizLoopManager.setLoopFunction(
                 SELECTWRITEOFFCOUNT,
                 LoopInfo(3, TicketModel::selectWriteOffCount, scheduler = Schedulers.io())
@@ -100,9 +101,10 @@ object TicketModel : IOchOnMessageListener<WriteOffPassenger>{
     private fun selectWriteOffCount(){
         LineManager.getStations().first?.let { firstStation->
             LineModel.currentTask?.let { currentTask->
-                ShuttleSaasServiceManager.queryBusTaskByLineId(AbsMogoApplication.getApp(),
-                    "${currentTask.taskId}",
-                    "${firstStation.siteId}",
+                RepositoryManager.queryWriteoffCount(
+                    AbsMogoApplication.getApp(),
+                    currentTask.taskId?:0L,
+                    firstStation.siteId.toLong(),
                     object : OchCommonServiceCallback<WriteOffCountResponse> {
                         override fun onSuccess(data: WriteOffCountResponse?) {
                             data?.data?.let {
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/IRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/IRepository.kt
index 64f2e1edd5..f643044da0 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/IRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/IRepository.kt
@@ -1,7 +1,9 @@
 package com.mogo.och.weaknet.repository
 
+import android.content.Context
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse
+import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
 import com.mogo.och.weaknet.repository.db.bean.LineDataBean
 import com.mogo.och.weaknet.repository.db.bean.TaskDataBean
 import io.reactivex.Observable
@@ -22,7 +24,7 @@ interface IRepository {
 
     fun endTask( taskId: Long): Observable<Boolean>?
 
-    fun queryCarExecutableTaskList(
-        ochCommonServiceCallback: OchCommonServiceCallback<CarExecutableTaskResponse>
-    ){}
+    fun queryWriteoffCount(context: Context, taskId: Long, siteId: Long, callback: OchCommonServiceCallback<WriteOffCountResponse>?)
+
+    fun queryCarExecutableTaskList(ochCommonServiceCallback: OchCommonServiceCallback<CarExecutableTaskResponse>)
 }
\ No newline at end of file
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt
index 2a3bdbeae1..b7f2d65f19 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt
@@ -1,10 +1,12 @@
 package com.mogo.och.weaknet.repository
 
+import android.content.Context
 import com.mogo.commons.env.ProjectUtils
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse
+import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
 import com.mogo.och.weaknet.repository.db.bean.LineDataBean
 import com.mogo.och.weaknet.repository.db.bean.TaskDataBean
 import com.mogo.och.weaknet.repository.db.repository.EventDb
@@ -64,6 +66,10 @@ object RepositoryManager {
         return repository.endTask(taskId)
     }
 
+    fun queryWriteoffCount(context: Context, taskId: Long, siteId: Long, callback: OchCommonServiceCallback<WriteOffCountResponse>?){
+        repository.queryWriteoffCount(context,taskId,siteId,callback)
+    }
+
 
     fun haveDataWaitSyn(): Boolean {
         if(ProjectUtils.isSaas()&&AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/BusRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/BusRepository.kt
index 66e7c8bb2b..f6d95418cb 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/BusRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/BusRepository.kt
@@ -1,10 +1,14 @@
 package com.mogo.och.weaknet.repository.impl
 
+import android.content.Context
 import com.mogo.och.common.module.manager.autopilot.line.LineManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
+import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.data.bean.BusStationBean
 import com.mogo.och.data.bean.ContraiInfo
 import com.mogo.och.data.bean.LineInfo
+import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse
+import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
 import com.mogo.och.weaknet.model.LineModel
 import com.mogo.och.weaknet.repository.db.bean.LineDataBean
 import com.mogo.och.weaknet.repository.db.bean.TaskDataBean
@@ -124,5 +128,13 @@ class BusRepository: IRepository {
         return BusServiceManager.endTask(taskId)
     }
 
+    override fun queryWriteoffCount(context: Context, taskId: Long, siteId: Long, callback: OchCommonServiceCallback<WriteOffCountResponse>?) {
+        BusServiceManager.writeOffCount(context,taskId,siteId,callback)
+    }
+
+    override fun queryCarExecutableTaskList(ochCommonServiceCallback: OchCommonServiceCallback<CarExecutableTaskResponse>) {
+
+    }
+
 
 }
\ No newline at end of file
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/BusSaasRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/BusSaasRepository.kt
index 88a05dc069..a344e92133 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/BusSaasRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/BusSaasRepository.kt
@@ -1,24 +1,26 @@
 package com.mogo.och.weaknet.repository.impl
 
-import com.mogo.commons.AbsMogoApplication
+import android.content.Context
 import com.mogo.och.common.module.manager.autopilot.line.LineManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
+import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.data.bean.BusStationBean
 import com.mogo.och.data.bean.ContraiInfo
 import com.mogo.och.data.bean.LineInfo
+import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse
+import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
 import com.mogo.och.weaknet.model.LineModel
 import com.mogo.och.weaknet.repository.db.bean.LineDataBean
 import com.mogo.och.weaknet.repository.db.bean.TaskDataBean
 import com.mogo.och.weaknet.repository.IRepository
 import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean
-import com.mogo.och.weaknet.repository.net.bussaas.BusShuttleServiceManager
-import com.mogo.och.weaknet.repository.net.shuttle.ShuttleServiceManager
+import com.mogo.och.weaknet.repository.net.bussaas.BusSaasServiceManager
 import io.reactivex.Observable
 
 class BusSaasRepository: IRepository {
 
     override fun loadCurrentTaskInfo(): Observable<Boolean>? {
-        return BusShuttleServiceManager.queryBusRoutes()
+        return BusSaasServiceManager.queryBusRoutes()
             ?.flatMap { busRoutesResult ->
                 if (!busRoutesResult.sites.isNullOrEmpty() && busRoutesResult.sites.size > 1) {
                     OchChainLogManager.writeChainLogDb(
@@ -86,11 +88,11 @@ class BusSaasRepository: IRepository {
     }
 
     override fun queryCanUseLine(): Observable<List<LineDataBean>?>? {
-        return BusShuttleServiceManager.queryBusLines()
+        return BusSaasServiceManager.queryBusLines()
     }
 
     override fun queryCanUserTask(lineId: Long): Observable<List<TaskDataBean>?>? {
-        return BusShuttleServiceManager.queryBusTaskByLineId(lineId)
+        return BusSaasServiceManager.queryBusTaskByLineId(lineId)
     }
 
     override fun startTask(
@@ -99,7 +101,7 @@ class BusSaasRepository: IRepository {
         taskTime: Long,
         lineName: String
     ): Observable<Boolean>? {
-        return BusShuttleServiceManager.switchLine(taskId)
+        return BusSaasServiceManager.switchLine(taskId)
     }
 
     override fun leaveStation(
@@ -109,11 +111,11 @@ class BusSaasRepository: IRepository {
         lineId: Long,
         taskStartTime: Long
     ): Observable<Boolean>? {
-        return BusShuttleServiceManager.leaveStation(seq, siteId, taskId, System.currentTimeMillis())
+        return BusSaasServiceManager.leaveStation(seq, siteId, taskId, System.currentTimeMillis())
     }
 
     override fun arriveStation(seq: Int, siteId: Long, taskId: Long): Observable<Boolean>? {
-        return BusShuttleServiceManager.arriveSiteStation(
+        return BusSaasServiceManager.arriveSiteStation(
             seq,
             siteId,
             taskId,
@@ -122,7 +124,20 @@ class BusSaasRepository: IRepository {
     }
 
     override fun endTask(taskId: Long): Observable<Boolean>? {
-        return BusShuttleServiceManager.endTask(taskId)
+        return BusSaasServiceManager.endTask(taskId)
+    }
+
+    override fun queryWriteoffCount(
+        context: Context,
+        taskId: Long,
+        siteId: Long,
+        callback: OchCommonServiceCallback<WriteOffCountResponse>?
+    ) {
+        BusSaasServiceManager.writeOffCount(context,taskId,siteId,callback)
+    }
+
+    override fun queryCarExecutableTaskList(ochCommonServiceCallback: OchCommonServiceCallback<CarExecutableTaskResponse>) {
+
     }
 
 
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/ShuttleRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/ShuttleRepository.kt
index a438d01ed0..fcc34fdd1e 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/ShuttleRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/ShuttleRepository.kt
@@ -1,10 +1,14 @@
 package com.mogo.och.weaknet.repository.impl
 
+import android.content.Context
 import com.mogo.och.common.module.manager.autopilot.line.LineManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
+import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.data.bean.BusStationBean
 import com.mogo.och.data.bean.ContraiInfo
 import com.mogo.och.data.bean.LineInfo
+import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse
+import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
 import com.mogo.och.weaknet.model.LineModel
 import com.mogo.och.weaknet.repository.db.bean.LineDataBean
 import com.mogo.och.weaknet.repository.db.bean.TaskDataBean
@@ -115,4 +119,18 @@ class ShuttleRepository: IRepository {
         return ShuttleServiceManager.endTask(taskId)
     }
 
+    override fun queryWriteoffCount(
+        context: Context,
+        taskId: Long,
+        siteId: Long,
+        callback: OchCommonServiceCallback<WriteOffCountResponse>?
+    ) {
+        ShuttleServiceManager.writeOffCount(context,taskId,siteId,callback)
+    }
+
+    override fun queryCarExecutableTaskList(ochCommonServiceCallback: OchCommonServiceCallback<CarExecutableTaskResponse>) {
+
+    }
+
+
 }
\ No newline at end of file
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/ShuttleSaasRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/ShuttleSaasRepository.kt
index cc61dfaf56..cbbbe485d5 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/ShuttleSaasRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/ShuttleSaasRepository.kt
@@ -1,5 +1,6 @@
 package com.mogo.och.weaknet.repository.impl
 
+import android.content.Context
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.och.common.module.manager.autopilot.line.LineManager
@@ -7,6 +8,7 @@ import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.weaknet.bean.response.BusRoutesResponse
 import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse
+import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
 import com.mogo.och.weaknet.model.LineModel
 import com.mogo.och.weaknet.model.LineModel.currentTask
 import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean
@@ -272,6 +274,15 @@ class ShuttleSaasRepository : IRepository {
         }
     }
 
+    override fun queryWriteoffCount(
+        context: Context,
+        taskId: Long,
+        siteId: Long,
+        callback: OchCommonServiceCallback<WriteOffCountResponse>?
+    ) {
+        ShuttleSaasServiceManager.queryBusTaskByLineId(context,taskId.toString(),siteId.toString(),callback)
+    }
+
     override fun queryCarExecutableTaskList(
         ochCommonServiceCallback: OchCommonServiceCallback<CarExecutableTaskResponse>
     ) {
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bus/BusServiceManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bus/BusServiceManager.kt
index 738b6f7793..5ab6e7b76b 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bus/BusServiceManager.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bus/BusServiceManager.kt
@@ -1,13 +1,18 @@
 package com.mogo.och.weaknet.repository.net.bus
 
+import android.content.Context
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.network.OchCommonNet
+import com.mogo.och.common.module.network.OchCommonServiceCallback
+import com.mogo.och.common.module.network.OchCommonSubscribeImpl
+import com.mogo.och.common.module.network.interceptor.transformIoTry
 import com.mogo.och.common.module.network.interceptor.transformTry
 import com.mogo.och.data.bean.BusRoutesResult
 import com.mogo.och.weaknet.bean.request.BusQueryLineStationsRequest
+import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
 import com.mogo.och.weaknet.repository.db.bean.LineDataBean
 import com.mogo.och.weaknet.repository.db.bean.TaskDataBean
 import com.mogo.och.weaknet.repository.net.bean.request.BusCloseTaskRequest
@@ -166,4 +171,24 @@ object BusServiceManager {
                 Observable.just(it.data)
             }
     }
+
+    /**
+     *
+     */
+    @JvmStatic
+    fun writeOffCount(
+        context: Context,
+        taskId: Long,
+        siteId: Long,
+        callback: OchCommonServiceCallback<WriteOffCountResponse>?
+    ) {
+        mService.writeOffCount(
+            MoGoAiCloudClientConfig.getInstance().serviceAppId,
+            SharedPrefsMgr.getInstance().token,
+            taskId,
+            siteId
+        )
+            .transformIoTry()
+            .subscribe(OchCommonSubscribeImpl(context, callback, "writeOffCount"))
+    }
 }
\ No newline at end of file
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bus/IBusApiService.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bus/IBusApiService.kt
index 21e959f7be..f1f18dceeb 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bus/IBusApiService.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bus/IBusApiService.kt
@@ -3,6 +3,7 @@ package com.mogo.och.weaknet.repository.net.bus
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.och.weaknet.bean.request.BusQueryLineStationsRequest
 import com.mogo.och.weaknet.bean.response.BusRoutesResponse
+import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
 import com.mogo.och.weaknet.repository.net.bean.request.BusCloseTaskRequest
 import com.mogo.och.weaknet.repository.net.bean.request.BusResetDrivingLineRequest
 import com.mogo.och.weaknet.repository.net.bean.request.BusRoutePlanningUpdateReqBean
@@ -138,5 +139,18 @@ interface IBusApiService {
     @Headers("Content-type:application/json;charset=UTF-8")
     @POST("/autopilot-car-hailing/cab/flow/v1/bus/driver/bus/endTask")
     fun endTask(@Header("appId") appId: String?, @Header("ticket") ticket: String?, @Body data: BusCloseTaskRequest?): Observable<BaseData>
+
+
+    /**
+     * 任务正常跑完结束
+     * @param appId
+     * @param ticket
+     * @param data
+     * @return
+     */
+    @Headers("Content-type:application/json;charset=UTF-8")
+    @POST("/och-bus-cabin/cab/flow/v1/bus/driver/endTask")
+    fun writeOffCount(@Header("appId") appId: String?, @Header("ticket") ticket: String?,  @Query("taskId") taskId: Long , @Query("siteId")siteId: Long ): Observable<WriteOffCountResponse>
+
 }
 
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bussaas/BusShuttleServiceManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bussaas/BusSaasServiceManager.kt
similarity index 86%
rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bussaas/BusShuttleServiceManager.kt
rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bussaas/BusSaasServiceManager.kt
index 283a3f6c28..32dacd9e12 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bussaas/BusShuttleServiceManager.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bussaas/BusSaasServiceManager.kt
@@ -1,12 +1,17 @@
 package com.mogo.och.weaknet.repository.net.bussaas
 
+import android.content.Context
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.network.OchCommonNet
+import com.mogo.och.common.module.network.OchCommonServiceCallback
+import com.mogo.och.common.module.network.OchCommonSubscribeImpl
+import com.mogo.och.common.module.network.interceptor.transformIoTry
 import com.mogo.och.common.module.network.interceptor.transformTry
 import com.mogo.och.data.bean.BusRoutesResult
+import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
 import com.mogo.och.weaknet.repository.db.bean.LineDataBean
 import com.mogo.och.weaknet.repository.db.bean.TaskDataBean
 import com.mogo.och.weaknet.repository.net.bean.request.BusCloseTaskRequest
@@ -18,7 +23,7 @@ import io.reactivex.Observable
  * @author: wangmingjun
  * @date: 2021/10/20
  */
-object BusShuttleServiceManager {
+object BusSaasServiceManager {
 
     private val M_SAAS_SERVICE: IBusSaasApiService =
         MoGoRetrofitFactory.getInstance(OchCommonConst.getBaseUrl()).create(
@@ -178,4 +183,24 @@ object BusShuttleServiceManager {
             }
     }
 
+    /**
+     *
+     */
+    @JvmStatic
+    fun writeOffCount(
+        context: Context,
+        taskId: Long,
+        siteId: Long,
+        callback: OchCommonServiceCallback<WriteOffCountResponse>?
+    ) {
+        M_SAAS_SERVICE.writeOffCount(
+            MoGoAiCloudClientConfig.getInstance().serviceAppId,
+            SharedPrefsMgr.getInstance().token,
+            taskId,
+            siteId
+        )
+            .transformIoTry()
+            .subscribe(OchCommonSubscribeImpl(context, callback, "writeOffCount"))
+    }
+
 }
\ No newline at end of file
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bussaas/IBusSaasApiService.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bussaas/IBusSaasApiService.kt
index 8316dd60e8..9cf7949286 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bussaas/IBusSaasApiService.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bussaas/IBusSaasApiService.kt
@@ -2,6 +2,7 @@ package com.mogo.och.weaknet.repository.net.bussaas
 
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.och.weaknet.bean.response.BusRoutesResponse
+import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
 import com.mogo.och.weaknet.repository.net.bean.request.BusCloseTaskRequest
 import com.mogo.och.weaknet.repository.net.bean.request.BusResetDrivingLineRequest
 import com.mogo.och.weaknet.repository.net.bean.request.BusRoutePlanningUpdateReqBean
@@ -111,5 +112,18 @@ interface IBusSaasApiService {
     @Headers("Content-type:application/json;charset=UTF-8")
     @POST("/och-bus-cabin/cab/flow/v1/bus/driver/endTask")
     fun endTask(@Header("appId") appId: String?, @Header("ticket") ticket: String?, @Body data: BusCloseTaskRequest?): Observable<BaseData>
+
+
+    /**
+     * 任务正常跑完结束
+     * @param appId
+     * @param ticket
+     * @param data
+     * @return
+     */
+    @Headers("Content-type:application/json;charset=UTF-8")
+    @POST("/och-bus-cabin/cab/flow/v1/bus/driver/endTask")
+    fun writeOffCount(@Header("appId") appId: String?, @Header("ticket") ticket: String?,  @Query("taskId") taskId: Long , @Query("siteId")siteId: Long ): Observable<WriteOffCountResponse>
+
 }
 
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/shuttle/IShuttleApiService.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/shuttle/IShuttleApiService.java
index 80c277ab73..9745153e45 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/shuttle/IShuttleApiService.java
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/shuttle/IShuttleApiService.java
@@ -105,8 +105,8 @@ public interface IShuttleApiService {
 
 
     @Headers( {"Content-type:application/json;charset=UTF-8"} )
-    @GET("och-shuttle-cabin/api/business/v1/task/writeOffCount")
-    Observable<WriteOffCountResponse> writeOffCount(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("taskId") String taskId, @Query("siteId") String siteId);
+    @GET("och-vehicle/api/car/v2/device/writeOff")
+    Observable<WriteOffCountResponse> writeOffCount(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("taskId") long taskId, @Query("siteId") long siteId);
 
 }
 
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/shuttle/ShuttleServiceManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/shuttle/ShuttleServiceManager.kt
index 61ccb73086..93607b8238 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/shuttle/ShuttleServiceManager.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/shuttle/ShuttleServiceManager.kt
@@ -181,4 +181,25 @@ object ShuttleServiceManager {
                 Observable.just(it.data)
             }
     }
+
+    /**
+     * 只发生在大理环境 查询当前站点核销的人数
+     */
+    @JvmStatic
+    fun writeOffCount(
+        context: Context,
+        taskId: Long,
+        siteId: Long,
+        callback: OchCommonServiceCallback<WriteOffCountResponse>?
+    ) {
+        mService.writeOffCount(
+            MoGoAiCloudClientConfig.getInstance().serviceAppId,
+            SharedPrefsMgr.getInstance().token,
+            taskId,
+            siteId
+        )
+            .transformIoTry()
+            .subscribe(OchCommonSubscribeImpl(context, callback, "writeOffCount"))
+    }
+
 }
\ No newline at end of file
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/shuttlesaas/IShuttleSaasApiService.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/shuttlesaas/IShuttleSaasApiService.java
index a3b728ecc2..8aa6d42ae3 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/shuttlesaas/IShuttleSaasApiService.java
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/shuttlesaas/IShuttleSaasApiService.java
@@ -38,7 +38,7 @@ public interface IShuttleSaasApiService {
      * 查询当前站点核销的人数
      */
     @Headers( {"Content-type:application/json;charset=UTF-8"} )
-    @GET("och-shuttle-cabin/api/business/v1/task/writeOffCount")
+    @GET("/och-vehicle/api/car/v2/device/writeOff")
     Observable<WriteOffCountResponse> writeOffCount(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("taskId") String taskId, @Query("siteId") String siteId);
 
     /**