From 7dccb37867d45e638464f6a2a5cc97d4a4637a71 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 26 Mar 2023 16:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=BF=AB=E9=80=92=E5=8D=95?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sync/JD/JDServiceOrderSyncBusiness.cs      | 18 +++++++++++++++++-
 BBWY.Server.Business/Sync/OrderSyncBusiness.cs |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs
index 62e131d7..0709b372 100644
--- a/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs
@@ -410,7 +410,7 @@ huitongkuaidi  百世快递
                                          .SetIf(isUpdateSubscribe, s => s.IsSubscribeKuaiDi100, true);
                         updateSerivceOrderList.Add(update);
 
-                        if (isUpdateDelivery)
+                        if (isUpdateDelivery && insertExpressOrderList.Count(e => e.WayBillNo == serviceOrder.WayBillNo) == 0)
                         {
                             insertExpressOrderList.Add(new ExpressOrder()
                             {
@@ -426,6 +426,22 @@ huitongkuaidi  百世快递
                     }
                 }
 
+                if (insertExpressOrderList.Count() > 0)
+                {
+                    var insertExpressOrderWayBillNoList = insertExpressOrderList.Select(e => e.WayBillNo).ToList();
+                    var dbWayBillNoList = fsql.Select<ExpressOrder>().Where(e => insertExpressOrderWayBillNoList.Contains(e.WayBillNo)).ToList(e => e.WayBillNo);
+                    if (dbWayBillNoList.Count() > 0)
+                    {
+                        for (var i = 0; i < insertExpressOrderList.Count(); i++)
+                        {
+                            if (dbWayBillNoList.Any(w => w == insertExpressOrderList[i].WayBillNo))
+                            {
+                                insertExpressOrderList.Remove(insertExpressOrderList[i]);
+                                i--;
+                            }
+                        }
+                    }
+                }
 
                 fsql.Transaction(() =>
                 {
diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
index 9938bd21..f345e429 100644
--- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
@@ -735,7 +735,7 @@ namespace BBWY.Server.Business
             var shopList = venderBusiness.GetShopList(platform: Enums.Platform.京东);
             foreach (var shop in shopList)
             {
-                Task.Factory.StartNew(() => SyncOrder(shop, string.Empty, isAuto: true), System.Threading.CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.SyncOrderTaskScheduler);
+                Task.Factory.StartNew(() => SyncOrder(shop, string.Empty, isAuto: true), CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.SyncOrderTaskScheduler);
             }
         }