From 5c3f026aa7c7948ca15dcd0d0bd7415c306ad97d Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 25 May 2023 12:40:15 +0800
Subject: [PATCH] =?UTF-8?q?[3.2.0]=20M1=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E8=AE=A2=E5=8D=95writeVersion=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../magic/mogo/och/charter/model/DriverM1Model.kt  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git 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
index 3384d1b3ff..97414b122c 100644
--- 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)
     }