[6.8.0]

[fea]
[核销]

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerManager.kt

@@ -161,7 +161,10 @@ object ScannerManager : IOchLanPassengerStatusListener {
                     bindStatus = BindStatus.EXCEPTION
                 }
 
-                else -> {}
+                else -> {
+                    CallerLogger.d(M_BUS_P + TAG, "扫码枪未初始化")
+                    bindStatus = BindStatus.NOTHING
+                }
             }
         }
 
@@ -208,7 +211,9 @@ object ScannerManager : IOchLanPassengerStatusListener {
         LoginLanPassengerSocket.addListener(TAG, this)
         // 核销设备信息
         LanSocketManager.registerSocketMessageListener(DPMsgType.TYPE_WRITEOFF_DEVICES_INFO.type,writeOfDevicefMsg)
+        // 绑定状态
         DevicesManager.addBindStateChangeListener(TAG, onSerialPortListener)
+        // 核销信息
         DevicesManager.addVerificationListener(TAG, onDeviceVerificationListener)
     }
 
@@ -217,6 +222,7 @@ object ScannerManager : IOchLanPassengerStatusListener {
             return
         }
         stateChanageListeners[tag] = listener
+        listener.stateChange(bindStatus, openStatus)
     }
 
     fun removeListener(tag:String){
@@ -311,7 +317,11 @@ object ScannerManager : IOchLanPassengerStatusListener {
 }
 
 enum class BindStatus {
-    BIND_SUCCEED, BIND_FAILURE_UNINSTALLED, BIND_FAILURE_NO_PERMISSION_NOT_FOUND, EXCEPTION, NOTHING
+    BIND_SUCCEED,
+    BIND_FAILURE_UNINSTALLED,
+    BIND_FAILURE_NO_PERMISSION_NOT_FOUND,
+    EXCEPTION,
+    NOTHING
 }
 
 enum class OpenStatus {

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

@@ -134,7 +134,7 @@ class WriteOffCacheRepository : IWriteOffRepository {
                 if (!it.orderNo.isNullOrEmpty()) {
                     val lastWriteOff = WriteOffDb.queryWaitUpdateEventCount(it.orderNo!!)
                     // 7、校验次数
-                    if ((it.availableTimes ?: 0) >= (lastWriteOff?.size ?: 0)) {
+                    if ((it.availableTimes ?: 0) <= (lastWriteOff?.size ?: 0)) {
                         throw DataException(1008, "车票剩余可用次数为0")
                     }
                     if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {