diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index 4b753c32..73aa3703 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -89,7 +89,7 @@ namespace BBWY.Server.Business (o, ocs, oct, sh) => (o.OrderState != Enums.OrderState.已取消 && o.StorageType != Enums.StorageType.SD && o.StorageType != null && - (oct.PurchaseAmount == 0M || oct.Profit < 0)) || + (SqlExt.IsNull(oct.PurchaseAmount, 0) == 0M || SqlExt.IsNull(oct.Profit, 0) < 0)) || (o.StorageType == null && !filterExceptionStateList.Contains(o.OrderState))) .WhereIf(searchOrderRequest.OnlyDF, (o, ocs, oct, sh) => o.StorageType == Enums.StorageType.代发) diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs index 42a11be3..b6b92d09 100644 --- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs +++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs @@ -5,6 +5,7 @@ using BBWY.Server.Model; using BBWY.Server.Model.Db; using BBWY.Server.Model.Db.Mds; using BBWY.Server.Model.Dto; +using FreeSql; using Newtonsoft.Json; using System; using System.Collections.Generic; @@ -380,7 +381,7 @@ namespace BBWY.Server.Business ((o.OrderState != Enums.OrderState.已取消 && o.StorageType != Enums.StorageType.SD && o.StorageType != null && - (oc.PurchaseAmount == 0M || oc.Profit < 0)) || + (SqlExt.IsNull(oc.PurchaseAmount, 0) == 0M || SqlExt.IsNull(oc.Profit, 0) < 0)) || (o.StorageType == null && !filterExceptionStateList.Contains(o.OrderState)))).Count(); diff --git a/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs b/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs index 65bf22e6..47ca95ae 100644 --- a/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs +++ b/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs @@ -58,11 +58,12 @@ namespace BBWY.Server.Model.Dto /// public bool ExcludeCanceled { get; set; } - /// - /// 是否包含售后单 - /// + //public bool? IsContainsAfterSaleOrder { get;set; } + /// + /// 是否包含异常单 + /// public bool IncludeExceptionOrder { get; set; } ///