[6.8.0]

[fea]
[核销、未通知小程序]

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt

@@ -3,13 +3,14 @@ package com.mogo.och.weaknet.bean.request
 import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.network.utils.digest.DigestUtils
 import com.mogo.och.common.module.biz.login.LoginStatusManager
+import com.mogo.och.common.module.manager.device.checkvin.CheckVinManager
 import com.mogo.och.weaknet.repository.db.bean.EventDataBean
 import com.mogo.och.weaknet.repository.db.bean.WriteOffDataBean
 
 /**
  * 上报事件
  */
-data class ShuttleEventRequest(val requestId: String, val sn: String, val businessType: Int,val eventList:MutableList<Event>){
+data class ShuttleEventRequest(val requestId: String, val sn: String,val vin:String ,val businessType: Int,val eventList:MutableList<Event>){
     companion object{
         fun transformDb2Net(
             waitUpdateEvent: List<EventDataBean>?,
@@ -32,7 +33,7 @@ data class ShuttleEventRequest(val requestId: String, val sn: String, val busine
                 eventList4Request.add(tempEvent!!)
             }
             val md5Hex = DigestUtils.md5Hex(eventList4Request.toString())
-            return ShuttleEventRequest(md5Hex, SharedPrefsMgr.getInstance().sn,
+            return ShuttleEventRequest(md5Hex, SharedPrefsMgr.getInstance().sn, CheckVinManager.getVin(),
                 businessTypeShuttle,eventList4Request)
         }
     }

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/WriteOffDataBean.kt

@@ -63,8 +63,8 @@ data class WriteOffDataBean(
     /**
      * 剩余核销次数>0
      */
-    @ColumnInfo(name = "remaining_times", typeAffinity = ColumnInfo.INTEGER)
-    var remainingTimes: Int? = null,
+    @ColumnInfo(name = "available_times", typeAffinity = ColumnInfo.INTEGER)
+    var availableTimes: Int? = null,
 
     /**
      * 订单号

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt

@@ -9,6 +9,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.och.common.module.biz.login.LoginStatusManager
 import com.mogo.och.common.module.manager.autopilot.line.LineManager
+import com.mogo.och.common.module.manager.cache.OchSPManager
 import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffDetialMsg
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.utils.DateTimeUtil
@@ -126,7 +127,7 @@ class WriteOffCacheRepository : IWriteOffRepository {
 
                 if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
                     // 6、校验次数
-                    if((it.remainingTimes?:0)<=0){
+                    if((it.availableTimes?:0)<=0){
                         throw DataException(1008,"车票剩余可用次数为0")
                     }
                     // 7、同一个订单2分钟内只能核销一次
@@ -140,6 +141,8 @@ class WriteOffCacheRepository : IWriteOffRepository {
                     }else{
                         throw DataException(11000,"缺少orderNo")
                     }
+                    val (start, _) = LineManager.getStations()
+                    siteId = start?.siteId?.toLong()?:0
                 }else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
                     val (start, _) = LineManager.getStations()
                     if(start?.siteId?.toLong()==it.startStationId){
@@ -156,15 +159,17 @@ class WriteOffCacheRepository : IWriteOffRepository {
                 addWrite.taskId = LineModel.currentTask?.taskId
                 addWrite.lineId = lineId
                 addWrite.siteId = siteId
-                addWrite.remainingTimes = it.remainingTimes
+                addWrite.availableTimes = it.availableTimes
                 addWrite.orderNo = it.orderNo
                 addWrite.uid = it.uid
                 addWrite.phone = it.phone
                 addWrite.ticketSize = it.ticketSize
                 addWrite.ticketName = it.ticketName
-                WriteOffDb.addOrUpdate()
-
-                val reslut = PassengerWriteOffResponse.Result(it.phone,it.ticketSize,it.ticketName,it.remainingTimes?.toLong())
+                addWrite.msgId = OchSPManager.getSn()+System.currentTimeMillis()
+                addWrite.driverId = LoginStatusManager.getLoginInfo()?.driverId?:0
+                addWrite.businessTime = System.currentTimeMillis()
+                WriteOffDb.addOrUpdate(addWrite)
+                val reslut = PassengerWriteOffResponse.Result(it.phone,it.ticketSize,it.ticketName,it.availableTimes?.toLong())
                 return@flatMap Observable.just(reslut)
             }
     }