Browse Source

1) 订单表新增字段IsGift,是否为赠品

2) 查询接口过滤赠品订单
qianyi
shanji 2 years ago
parent
commit
8a82beece7
  1. 4
      BBWY.Server.Business/Order/OrderBusiness.cs
  2. 6
      BBWY.Server.Model/Db/Order/Order.cs

4
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) 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); //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) 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) .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); .OrderByDescending((o, ocs, oct) => o.StartTime);
var orderSourceList = select.ToList((o, ocs, oct) => new ExportOrderResponse() var orderSourceList = select.ToList((o, ocs, oct) => new ExportOrderResponse()

6
BBWY.Server.Model/Db/Order/Order.cs

@ -179,6 +179,12 @@ namespace BBWY.Server.Model.Db
[Column(DbType = "bit")] [Column(DbType = "bit")]
public bool IsAfterSaleOrder { get; set; } = false; public bool IsAfterSaleOrder { get; set; } = false;
/// <summary>
/// 是否为赠品
/// </summary>
[Column(DbType = "bit")]
public bool IsGift { get; set; } = false;
#region 订单成本 #region 订单成本
/// <summary> /// <summary>
/// 平台扣点金额 /// 平台扣点金额

Loading…
Cancel
Save