From b55741f50cb8da3685e5d01363bf8e44ae686e1d Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Mon, 3 Apr 2023 14:28:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E8=8E=B1=E7=89=B9=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
index c6c8ad30..6f8e37e5 100644
--- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
@@ -125,6 +125,16 @@ namespace BBWY.Server.Business
                 if (orderListResponse.Data == null || orderListResponse.Data.Count == 0)
                     return;
 
+
+                if (shopId == 10388155)
+                {
+                    try
+                    {
+                        nLogManager.GetLogger($"订单同步-{shop.ShopName}").Info(orderListApiResult.Content);
+                    }
+                    catch { }
+                }
+
                 syncOrderMethodDic[shop.PlatformId](orderListResponse.Data, shopId, relayAPIHost, shop.AppKey, shop.AppSecret, shop.AppToken, shop.PlatformCommissionRatio ?? 0.05M);
             }
             catch (Exception ex)
@@ -259,6 +269,12 @@ namespace BBWY.Server.Business
                 var modifyTime = orderJToken.Value<DateTime?>("modified");
                 var endTime = orderJToken.Value<DateTime?>("orderEndTime");
                 var waybillNo = orderJToken.Value<string>("waybill");
+                var freightPrice = orderJToken.Value<decimal>("freightPrice");
+                var orderPayment = orderJToken.Value<decimal>("orderPayment");
+                var sellerPreferentialAmount = orderJToken.Value<decimal>("sellerDiscount");
+                var orderSellerPrice = orderJToken.Value<decimal>("orderSellerPrice");
+                var orderTotalPrice = orderJToken.Value<decimal>("orderTotalPrice");
+
                 if (dbOrder == null)
                 {
                     dbOrder = new Order()
@@ -266,14 +282,14 @@ namespace BBWY.Server.Business
                         Id = orderId,
                         BuyerRemark = buyerRemark,
                         VenderRemark = venderRemark,
-                        FreightPrice = orderJToken.Value<decimal>("freightPrice"),
+                        FreightPrice = freightPrice,
                         EndTime = endTime,
                         StartTime = orderJToken.Value<DateTime>("orderStartTime"),
                         ModifyTime = modifyTime,
-                        OrderPayment = orderJToken.Value<decimal>("orderPayment"),
-                        SellerPreferentialAmount = orderJToken.Value<decimal>("sellerDiscount"),
-                        OrderSellerPrice = orderJToken.Value<decimal>("orderSellerPrice"),
-                        OrderTotalPrice = orderJToken.Value<decimal>("orderTotalPrice"),
+                        OrderPayment = orderPayment,
+                        SellerPreferentialAmount = sellerPreferentialAmount,
+                        OrderSellerPrice = orderSellerPrice,
+                        OrderTotalPrice = orderTotalPrice,
                         OrderType = (Enums.OrderType)orderJToken.Value<int>("orderType"),
                         Platform = Enums.Platform.京东,
                         ShopId = shopId,
@@ -281,7 +297,7 @@ namespace BBWY.Server.Business
                         WaybillNo = waybillNo,
                         StoreOrder = orderJToken.Value<string>("storeOrder") ?? string.Empty,
                         StoreId = orderJToken.Value<string>("storeId"),
-                        IsGift = orderJToken.Value<decimal>("orderTotalPrice") == 0M || orderJToken.Value<decimal>("orderSellerPrice") == 0M
+                        IsGift = orderTotalPrice == 0M || orderSellerPrice == 0M
                     };
 
                     if (memoryCache.TryGetValue(orderId, out sDCalculationCostRequest))
@@ -415,7 +431,7 @@ namespace BBWY.Server.Business
                     orderState != Enums.OrderState.已取消)
                 {
                     var orderCost = dbOrderCostList.FirstOrDefault(oc => oc.OrderId == dbOrder.Id);
-                    if (orderCost == null)
+                    if (orderCost == null && orderTotalPrice > 0M)
                     {
                         if (isNewOrder && dbOrder.StorageType == Enums.StorageType.SD && sDCalculationCostRequest != null)
                         {
@@ -550,14 +566,25 @@ namespace BBWY.Server.Business
                          venderRemark != dbOrder.VenderRemark ||
                          modifyTime != dbOrder.ModifyTime ||
                          endTime != dbOrder.EndTime ||
-                         waybillNo != dbOrder.WaybillNo)
+                         waybillNo != dbOrder.WaybillNo ||
+                         freightPrice != dbOrder.FreightPrice ||
+                         orderPayment != dbOrder.OrderPayment ||
+                         sellerPreferentialAmount != dbOrder.SellerPreferentialAmount ||
+                         orderSellerPrice != dbOrder.OrderSellerPrice ||
+                         orderTotalPrice != dbOrder.OrderTotalPrice)
                 {
                     var updateSql = fsql.Update<Order>(orderId).SetIf(orderState != null && orderState != dbOrder.OrderState, o => o.OrderState, orderState)
                                                                .SetIf(buyerRemark != dbOrder.BuyerRemark, o => o.BuyerRemark, buyerRemark)
                                                                .SetIf(venderRemark != dbOrder.VenderRemark, o => o.VenderRemark, venderRemark)
                                                                .SetIf(modifyTime != dbOrder.ModifyTime, o => o.ModifyTime, modifyTime)
                                                                .SetIf(endTime != dbOrder.EndTime, o => o.EndTime, modifyTime)
-                                                               .SetIf(waybillNo != dbOrder.WaybillNo, o => o.WaybillNo, waybillNo);
+                                                               .SetIf(waybillNo != dbOrder.WaybillNo, o => o.WaybillNo, waybillNo)
+                                                               .SetIf(freightPrice != dbOrder.FreightPrice, o => o.FreightPrice, freightPrice)
+                                                               .SetIf(orderPayment != dbOrder.OrderPayment, o => o.OrderPayment, orderPayment)
+                                                               .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);
                     updateOrderList.Add(updateSql);
                 }
                 #endregion