From 92d2701a7c5635a10206f3bcdabb911e319fa25b Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Mon, 3 Apr 2023 19:54:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=BA=91=E4=BB=93=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sync/OrderSyncBusiness.cs                 | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
index 1a15c5c5..88ebb880 100644
--- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
@@ -281,7 +281,7 @@ namespace BBWY.Server.Business
                 var sellerPreferentialAmount = orderJToken.Value<decimal>("sellerDiscount");
                 var orderSellerPrice = orderJToken.Value<decimal>("orderSellerPrice");
                 var orderTotalPrice = orderJToken.Value<decimal>("orderTotalPrice");
-
+                var storeOrder = orderJToken.Value<string>("storeOrder") ?? string.Empty;
                 if (dbOrder == null)
                 {
                     dbOrder = new Order()
@@ -302,7 +302,7 @@ namespace BBWY.Server.Business
                         ShopId = shopId,
                         //VenderId = orderJToken.Value<long>("venderId"),
                         WaybillNo = waybillNo,
-                        StoreOrder = orderJToken.Value<string>("storeOrder") ?? string.Empty,
+                        StoreOrder = storeOrder,
                         StoreId = orderJToken.Value<string>("storeId"),
                         IsGift = orderTotalPrice == 0M || orderSellerPrice == 0M
                     };
@@ -320,10 +320,7 @@ namespace BBWY.Server.Business
                         dbOrder.SDPayChannel = sDCalculationCostRequest.SDPayChannel;
                     }
 
-                    if (dbOrder.StoreOrder.Contains("京仓"))
-                        dbOrder.StorageType = Enums.StorageType.京仓;
-                    else if (dbOrder.StoreOrder.Contains("云仓"))
-                        dbOrder.StorageType = Enums.StorageType.云仓;
+                    dbOrder.StorageType = ConvertStoreOrder(storeOrder);
 
                     var payType = orderJToken.Value<string>("payType");
                     if (payType.Contains("-"))
@@ -566,7 +563,6 @@ namespace BBWY.Server.Business
                 if (isNewOrder)
                 {
                     dbOrder.OrderState = orderState;
-                    //dbOrder.IsGift = 
                 }
                 else if ((orderState != null && orderState != dbOrder.OrderState) ||
                          buyerRemark != dbOrder.BuyerRemark ||
@@ -578,7 +574,8 @@ namespace BBWY.Server.Business
                          orderPayment != dbOrder.OrderPayment ||
                          sellerPreferentialAmount != dbOrder.SellerPreferentialAmount ||
                          orderSellerPrice != dbOrder.OrderSellerPrice ||
-                         orderTotalPrice != dbOrder.OrderTotalPrice)
+                         orderTotalPrice != dbOrder.OrderTotalPrice ||
+                         storeOrder != dbOrder.StoreOrder)
                 {
                     var updateSql = fsql.Update<Order>(orderId).SetIf(orderState != null && orderState != dbOrder.OrderState, o => o.OrderState, orderState)
                                                                .SetIf(buyerRemark != dbOrder.BuyerRemark, o => o.BuyerRemark, buyerRemark)
@@ -591,7 +588,8 @@ namespace BBWY.Server.Business
                                                                .SetIf(sellerPreferentialAmount != dbOrder.SellerPreferentialAmount, o => o.SellerPreferentialAmount, sellerPreferentialAmount)
                                                                .SetIf(orderSellerPrice != dbOrder.OrderSellerPrice, o => o.OrderSellerPrice, orderSellerPrice)
                                                                .SetIf(orderTotalPrice != dbOrder.OrderTotalPrice, o => o.OrderTotalPrice, orderTotalPrice)
-                                                               .SetIf(orderTotalPrice != dbOrder.OrderTotalPrice && orderTotalPrice > 0M, o => o.IsGift, false);
+                                                               .SetIf(orderTotalPrice != dbOrder.OrderTotalPrice && orderTotalPrice > 0M, o => o.IsGift, false)
+                                                               .SetIf(storeOrder != dbOrder.StoreOrder && dbOrder.StorageType == null, o => o.StorageType, ConvertStoreOrder(storeOrder));
                     updateOrderList.Add(updateSql);
                 }
                 #endregion
@@ -671,6 +669,17 @@ namespace BBWY.Server.Business
             });
         }
 
+        private Enums.StorageType? ConvertStoreOrder(string storeOrder)
+        {
+            if (string.IsNullOrEmpty(storeOrder))
+                return null;
+            if (storeOrder.Contains("京仓"))
+                return Enums.StorageType.京仓;
+            else if (storeOrder.Contains("云仓"))
+                return Enums.StorageType.云仓;
+            return null;
+        }
+
         /// <summary>
         /// 同步所有店铺的订单
         /// </summary>