|
|
@ -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) |
|
|
|