Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0

2023-05-25 13:38:43 +08:00
parent 78cd11e09f df85328ddc
commit c81d90bbc3
1 changed files with 12 additions and 2 deletions
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -482,10 +482,20 @@ class DriverM1Model {
                    ,mCurrentOrder!!.siteName
                    ,true
                    ,mCurrentOrder!!.arriveStatus
-                    ,mCurrentOrder!!.writeVersion)
+                    ,if(mCurrentOrder!!.writeVersion == 0L){
+                        DateTimeUtils.getCurTimeInMillis()
+                    }else{
+                        mCurrentOrder!!.writeVersion
+                    })
            }
        }
-        currentChangeDestMsg?.writeVersion = mCurrentOrder!!.writeVersion
+
+        currentChangeDestMsg?.writeVersion = if(mCurrentOrder!!.writeVersion == 0L){
+            DateTimeUtils.getCurTimeInMillis()
+        }else{
+            mCurrentOrder!!.writeVersion
+        }
+
        sendMsgToClient(currentChangeDestMsg)
    }