From 1e0e0ca32152c1209854dcceae8641065f2ab1f1 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Wed, 5 Apr 2023 12:47:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9A=82=E5=81=9C=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=B4=A7=E6=AC=BE=E7=AD=89=E4=BA=8E0=E6=97=B6?= =?UTF-8?q?=E9=80=A0=E6=88=90=E5=88=A9=E6=B6=A6=E4=B8=BA=E8=B4=9F=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Server.Business/Sync/OrderSyncBusiness.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs index 4655069d..50202211 100644 --- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs @@ -321,7 +321,7 @@ namespace BBWY.Server.Business WaybillNo = waybillNo, StoreOrder = storeOrder, StoreId = storeId, - IsGift = orderTotalPrice == 0M || orderSellerPrice == 0M, + IsGift = orderSellerPrice == 0M, StorageType = storageType }; @@ -457,7 +457,7 @@ namespace BBWY.Server.Business orderState != Enums.OrderState.已取消) { var orderCost = dbOrderCostList.FirstOrDefault(oc => oc.OrderId == dbOrder.Id); - if (orderCost == null && orderTotalPrice > 0M) + if (orderCost == null && orderSellerPrice > 0M) { if (isNewOrder && dbOrder.StorageType == Enums.StorageType.SD && sDCalculationCostRequest != null) { @@ -610,7 +610,7 @@ 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(orderSellerPrice > 0M, o => o.IsGift, false) .SetIf(storeOrder != dbOrder.StoreOrder, o => o.StoreOrder, storeOrder) .SetIf(storeOrder != dbOrder.StoreOrder, o => o.StorageType, storageType) .SetIf(preferentialAmount != dbOrder.PreferentialAmount, o => o.PreferentialAmount, preferentialAmount)