|
|
@ -21,6 +21,7 @@ namespace BBWY.Server.Business |
|
|
|
request.EndTime = request.EndTime.Date.AddDays(1).AddSeconds(-1); |
|
|
|
var orderList = fsql.Select<Order>() |
|
|
|
.Where(o => request.ShopIds.Contains(o.ShopId) && o.StartTime >= request.StartTime && o.StartTime <= request.EndTime) |
|
|
|
.Where(o => o.IsGift == false) |
|
|
|
.OrderBy(o => o.StartTime) |
|
|
|
.ToList(o => new BillCorrectionOrderResponse |
|
|
|
{ |
|
|
@ -113,7 +114,7 @@ namespace BBWY.Server.Business |
|
|
|
var currentOrderAfterOrderList = afterOrderList.Where(aso => aso.OrderId == billCorrectionRequest.OrderId).ToList(); |
|
|
|
|
|
|
|
orderCost.DeliveryExpressFreight = billCorrectionRequest.NewDeliveryExpressFreight; |
|
|
|
|
|
|
|
|
|
|
|
if (order.StorageType != Model.Enums.StorageType.SD) |
|
|
|
{ |
|
|
|
orderCost.CalculationOrderProfitAndCost(order, currentOrderAfterOrderList); |
|
|
|