|
|
@ -661,6 +661,9 @@ namespace BBWY.Server.Business |
|
|
|
if (dbOrder == null) |
|
|
|
throw new BusinessException($"订单号{relationPurchaseOrderRequest.OrderDropShipping.OrderId}不存在"); |
|
|
|
|
|
|
|
if (relationPurchaseOrderRequest.PlatformCommissionRatio == 0M) |
|
|
|
relationPurchaseOrderRequest.PlatformCommissionRatio = 0.05M; |
|
|
|
|
|
|
|
IInsert<OrderDropShipping> insertOrderDropShipping = null; |
|
|
|
IUpdate<OrderDropShipping> updateOrderDropShipping = null; |
|
|
|
IInsert<OrderCost> insertOrderCost = null; |
|
|
@ -714,6 +717,8 @@ namespace BBWY.Server.Business |
|
|
|
var orderCost = fsql.Select<OrderCost>(relationPurchaseOrderRequest.OrderDropShipping.OrderId).ToOne(); |
|
|
|
if (orderCost != null) |
|
|
|
{ |
|
|
|
orderCost.PlatformCommissionRatio = relationPurchaseOrderRequest.PlatformCommissionRatio; |
|
|
|
orderCost.PlatformCommissionAmount = dbOrder.OrderSellerPrice * relationPurchaseOrderRequest.PlatformCommissionRatio; |
|
|
|
orderCost.DeliveryExpressFreight = relationPurchaseOrderRequest.OrderDropShipping.DeliveryFreight; |
|
|
|
orderCost.PurchaseAmount = relationPurchaseOrderRequest.OrderDropShipping.PurchaseAmount; |
|
|
|
orderCost.Profit = dbOrder.OrderSellerPrice + |
|
|
@ -733,9 +738,6 @@ namespace BBWY.Server.Business |
|
|
|
{ |
|
|
|
var preferentialAmount = fsql.Select<OrderCoupon>().Where(oc => oc.OrderId == relationPurchaseOrderRequest.OrderDropShipping.OrderId) |
|
|
|
.ToAggregate(g => g.Sum(g.Key.CouponPrice)); |
|
|
|
|
|
|
|
if (relationPurchaseOrderRequest.PlatformCommissionRatio == 0M) |
|
|
|
relationPurchaseOrderRequest.PlatformCommissionRatio = 0.05M; |
|
|
|
orderCost = new OrderCost() |
|
|
|
{ |
|
|
|
OrderId = relationPurchaseOrderRequest.OrderDropShipping.OrderId, |
|
|
|