From a5aac066cb05efa2bd856536a182f6b6ca21a864 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Wed, 29 Mar 2023 17:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=92100=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=B7=B2=E5=85=A5=E5=BA=93=E8=A1=A5?=
 =?UTF-8?q?=E9=BD=90=E7=AD=BE=E6=94=B6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sync/JD/JDServiceOrderSyncBusiness.cs     | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs
index d31d0278..b7f7f67a 100644
--- a/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs
@@ -514,15 +514,24 @@ huitongkuaidi  百世快递
             if (expressOrder == null)
                 throw new Exception($"快递单号{waybillNo} 未找到对应的快递单");
 
-            if (expressOrder.TransportStatus == Enums.TransportState.已入库)  //已入库
+     
+            DateTime? signTime = null;
+            if (expressOrder.TransportStatus == Enums.TransportState.已入库)
+            {
+                if (expressOrder.SignTime == null)
+                {
+                    signTime = GetSignTime(jobject);
+                    fsql.Update<ExpressOrder>(expressOrder.Id).Set(e => e.SignTime, signTime)
+                                                              .Set(e => e.UpdateTime, DateTime.Now)
+                                                              .ExecuteAffrows();
+                }
                 return;
-
-            IUpdate<ExpressOrder> updateExpressOrder = null;
-            List<IUpdate<ServiceOrder>> updateServiceOrderList = new List<IUpdate<ServiceOrder>>();
+            }
 
             var isUpdate = false;
             Enums.TransportState? newStatus = null;
-            DateTime? signTime = null;
+            IUpdate<ExpressOrder> updateExpressOrder = null;
+            List<IUpdate<ServiceOrder>> updateServiceOrderList = new List<IUpdate<ServiceOrder>>();
 
             if (kuaiDi100PushStateList_zaitu.Contains(state) || kuaiDi100PushStateList_lanshou.Contains(state))
             {
@@ -539,10 +548,7 @@ huitongkuaidi  百世快递
                 {
                     isUpdate = true;
                     newStatus = Enums.TransportState.待质检;
-
-                    var data = jobject["lastResult"]["data"].Children().FirstOrDefault(d => kuaiDi100PushStateList_qianshou.Contains(d.Value<int>("statusCode")));
-                    if (data != null)
-                        signTime = DateTime.Parse(data.Value<string>("ftime"));
+                    signTime = GetSignTime(jobject);
                 }
             }
             else if (kuaiDi100PushStateList_paijian.Contains(state))
@@ -573,5 +579,14 @@ huitongkuaidi  百世快递
                 });
             }
         }
+
+        public DateTime? GetSignTime(JObject jobject)
+        {
+            DateTime? signTime = null;
+            var data = jobject["lastResult"]["data"].Children().FirstOrDefault(d => kuaiDi100PushStateList_qianshou.Contains(d.Value<int>("statusCode")));
+            if (data != null)
+                signTime = DateTime.Parse(data.Value<string>("ftime"));
+            return signTime;
+        }
     }
 }