From a4112750fea8c9c99eb57236099eddaab4ebd2b9 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sun, 2 Apr 2023 01:01:56 +0800 Subject: [PATCH] 1 --- BBWY.Server.Business/BillCorrection/BillCorrectionBusiness.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BBWY.Server.Business/BillCorrection/BillCorrectionBusiness.cs b/BBWY.Server.Business/BillCorrection/BillCorrectionBusiness.cs index 965ba98f..00b4f497 100644 --- a/BBWY.Server.Business/BillCorrection/BillCorrectionBusiness.cs +++ b/BBWY.Server.Business/BillCorrection/BillCorrectionBusiness.cs @@ -21,6 +21,7 @@ namespace BBWY.Server.Business request.EndTime = request.EndTime.Date.AddDays(1).AddSeconds(-1); var orderList = fsql.Select() .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);