[6.8.4]

[fea]
[核销二维码兼容]

OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/TicketModel.kt

@@ -103,6 +103,24 @@ object TicketModel : StateChangeListener {
                 }
             }
             try {
+                var tempType = 0
+                if (type is String) {
+                    when (type) {
+                        "shuttle" -> {
+                            tempType = 11
+                        }
+
+                        "bus" -> {
+                            tempType = 10
+                        }
+
+                        else -> {
+                            type.toInt()?:0
+                        }
+                    }
+                } else {
+                    tempType = type?.toInt() ?: 0
+                }
                 val writeOffDetail = WriteOffDetialMsg(0,"",
                     expiryTime?.toLong()?:0,
                     bookingTime?.toLong()?:0,
@@ -113,7 +131,7 @@ object TicketModel : StateChangeListener {
                     phoneNum,
                     ticketSize?.toInt()?:0,
                     URLDecoder.decode(ticketName?:"","UTF-8"),
-                    type?.toInt()?:0,
+                    tempType,
                     shiftsId?.toLong()?:0,
                     pipe,
                     startStationId?.toLong()?:0,