From 2e60e9d294df2ee911d90958dae6fb264142e271 Mon Sep 17 00:00:00 2001 From: sanji Date: Thu, 16 Nov 2023 15:26:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=82=E5=B8=B8=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=A4=E5=AE=9A=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Server.Business/Statistics/StatisticsBusiness.cs | 2 +- BBWY.Server.Business/TestBusiness.cs | 1 + .../Dto/Request/Test/RepairSkuDetailAndSkuGriooProfit.cs | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs index c2012a44..66544873 100644 --- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs +++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs @@ -375,7 +375,7 @@ namespace BBWY.Server.Business o.IsGift == false && o.OrderState != Enums.OrderState.已取消 && ((o.StorageType != Enums.StorageType.SD && o.StorageType != null && oc.PurchaseAmount == 0M) || - (o.StorageType != Enums.StorageType.SD && oc.PurchaseAmount + oc.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice) || + (o.StorageType != Enums.StorageType.SD && oc.PurchaseAmount + oc.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice + o.PingTaiChengDanYouHuiQuan) || (o.StorageType == null && o.OrderState != Enums.OrderState.等待采购))).Count(); response.WaitOutStoreCount = fsql.Select().Where(o => o.ShopId == shopId && o.OrderState == Enums.OrderState.待出库 && o.StartTime >= dt && diff --git a/BBWY.Server.Business/TestBusiness.cs b/BBWY.Server.Business/TestBusiness.cs index 16f8a7a7..ca5dc753 100644 --- a/BBWY.Server.Business/TestBusiness.cs +++ b/BBWY.Server.Business/TestBusiness.cs @@ -189,6 +189,7 @@ namespace BBWY.Server.Business o.StartTime >= request.StartTime && o.StartTime <= request.EndTime) .WhereIf(!string.IsNullOrEmpty(request.OrderId), o => o.Id == request.OrderId) + .WhereIf(request.OrderIdList != null && request.OrderIdList.Count() > 0, o => request.OrderIdList.Contains(o.Id)) .OrderByDescending(o => o.StartTime) .ToList(o => o.Id); diff --git a/BBWY.Server.Model/Dto/Request/Test/RepairSkuDetailAndSkuGriooProfit.cs b/BBWY.Server.Model/Dto/Request/Test/RepairSkuDetailAndSkuGriooProfit.cs index 3f13cd05..763b2584 100644 --- a/BBWY.Server.Model/Dto/Request/Test/RepairSkuDetailAndSkuGriooProfit.cs +++ b/BBWY.Server.Model/Dto/Request/Test/RepairSkuDetailAndSkuGriooProfit.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; namespace BBWY.Server.Model.Dto { @@ -11,5 +12,7 @@ namespace BBWY.Server.Model.Dto public long? ShopId { get; set; } public string OrderId { get; set; } + + public List OrderIdList { get; set; } } }