diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index 48fa7d9e..59f0c485 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -86,7 +86,8 @@ namespace BBWY.Server.Business } select = select.WhereIf(searchOrderRequest.ShopId != null, (o, ocs, oct, sh) => o.ShopId == searchOrderRequest.ShopId) - .WhereIf(!string.IsNullOrEmpty(searchOrderRequest.SDOperator), (o, ocs, oct, sh) => o.SDOperator == searchOrderRequest.SDOperator); + .WhereIf(!string.IsNullOrEmpty(searchOrderRequest.SDOperator), (o, ocs, oct, sh) => o.SDOperator == searchOrderRequest.SDOperator) + .Where((o, ocs, oct, sh) => o.IsGift == false); //select = select.Where((o, ocs, oct) => o.ShopId == searchOrderRequest.ShopId); @@ -276,6 +277,7 @@ namespace BBWY.Server.Business select = select.WhereIf(searchOrderRequest.ShopId != null, (o, ocs, oct) => o.ShopId == searchOrderRequest.ShopId) .WhereIf(!string.IsNullOrEmpty(searchOrderRequest.SDOperator), (o, ocs, oct) => o.SDOperator == searchOrderRequest.SDOperator) + .Where((o, ocs, oct) => o.IsGift == false) .OrderByDescending((o, ocs, oct) => o.StartTime); var orderSourceList = select.ToList((o, ocs, oct) => new ExportOrderResponse() diff --git a/BBWY.Server.Model/Db/Order/Order.cs b/BBWY.Server.Model/Db/Order/Order.cs index 1ed909df..e6649953 100644 --- a/BBWY.Server.Model/Db/Order/Order.cs +++ b/BBWY.Server.Model/Db/Order/Order.cs @@ -179,6 +179,12 @@ namespace BBWY.Server.Model.Db [Column(DbType = "bit")] public bool IsAfterSaleOrder { get; set; } = false; + /// + /// 是否为赠品 + /// + [Column(DbType = "bit")] + public bool IsGift { get; set; } = false; + #region 订单成本 /// /// 平台扣点金额