Browse Source

ordersku增加退款标识

qianyi
shanji 3 years ago
parent
commit
b611dc4eea
  1. 2
      BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs
  2. 2
      BBWY.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs
  3. 2
      BBWY.Client/Models/Order/Order.cs
  4. 5
      BBWY.Client/Models/Order/OrderSku.cs
  5. 4
      BBWY.Server.Business/Order/OrderBusiness.cs
  6. 2
      BBWY.Server.Model/Db/Order/Order.cs
  7. 6
      BBWY.Server.Model/Db/Order/OrderSku.cs
  8. 2
      BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs
  9. 2
      BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs
  10. 5
      BBWY.Server.Model/Dto/Response/Order/OrderSkuResponse.cs

2
BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs

@ -141,7 +141,7 @@ namespace BBWY.Client.Models
/// <summary> /// <summary>
/// 是否包含售后单 /// 是否包含售后单
/// </summary> /// </summary>
public bool IsAfterOrder { get; set; } public bool IsAfterSaleOrder { get; set; }
/// <summary> /// <summary>
/// 收货人信息 /// 收货人信息

2
BBWY.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs

@ -26,5 +26,7 @@
/// 代发信息Id /// 代发信息Id
/// </summary> /// </summary>
public long? OrderDropShippingId { get; set; } public long? OrderDropShippingId { get; set; }
public bool IsRefund { get; set; } = false;
} }
} }

2
BBWY.Client/Models/Order/Order.cs

@ -162,7 +162,7 @@ namespace BBWY.Client.Models
/// <summary> /// <summary>
/// 是否包含售后单 /// 是否包含售后单
/// </summary> /// </summary>
public bool IsAfterOrder { get; set; } public bool IsAfterSaleOrder { get; set; }
/// <summary> /// <summary>
/// 收货人信息 /// 收货人信息

5
BBWY.Client/Models/Order/OrderSku.cs

@ -23,5 +23,10 @@
/// 代发信息Id /// 代发信息Id
/// </summary> /// </summary>
public long? OrderDropShippingId { get; set; } public long? OrderDropShippingId { get; set; }
/// <summary>
/// 是否退款
/// </summary>
public bool IsRefund { get; set; } = false;
} }
} }

4
BBWY.Server.Business/Order/OrderBusiness.cs

@ -90,7 +90,7 @@ namespace BBWY.Server.Business
} }
select = select.Where((o, ocs, oct) => o.ShopId == searchOrderRequest.ShopId) select = select.Where((o, ocs, oct) => o.ShopId == searchOrderRequest.ShopId)
.Where((o, ocs, oct) => o.IsAfterOrder == searchOrderRequest.IsContainsAfterOrder) .Where((o, ocs, oct) => o.IsAfterSaleOrder == searchOrderRequest.IsContainsAfterSaleOrder)
.OrderByDescending((o, ocs, oct) => o.StartTime) .OrderByDescending((o, ocs, oct) => o.StartTime)
.Count(out var total) .Count(out var total)
.Page(searchOrderRequest.PageIndex, searchOrderRequest.PageSize); .Page(searchOrderRequest.PageIndex, searchOrderRequest.PageSize);
@ -123,7 +123,7 @@ namespace BBWY.Server.Business
SDOperator = o.SDOperator, SDOperator = o.SDOperator,
SDPayBillNo = o.SDPayBillNo, SDPayBillNo = o.SDPayBillNo,
SDPayChannel = o.SDPayChannel, SDPayChannel = o.SDPayChannel,
IsAfterOrder = o.IsAfterOrder, IsAfterSaleOrder = o.IsAfterSaleOrder,
ContactName = ocs.ContactName, ContactName = ocs.ContactName,
Address = ocs.Address, Address = ocs.Address,

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

@ -171,7 +171,7 @@ namespace BBWY.Server.Model.Db
/// 是否为售后订单 /// 是否为售后订单
/// </summary> /// </summary>
[Column(DbType = "bit")] [Column(DbType = "bit")]
public bool IsAfterOrder { get; set; } = false; public bool IsAfterSaleOrder { get; set; } = false;
#region 订单成本 #region 订单成本
/// <summary> /// <summary>

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

@ -55,6 +55,12 @@ namespace BBWY.Server.Model.Db
/// </summary> /// </summary>
[Column(DbType = "bigint(1)", IsNullable = true)] [Column(DbType = "bigint(1)", IsNullable = true)]
public long? OrderDropShippingId { get; set; } public long? OrderDropShippingId { get; set; }
/// <summary>
/// 是否退款
/// </summary>
[Column(DbType = "bit")]
public bool IsRefund { get; set; } = false;
} }
} }

2
BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs

@ -56,7 +56,7 @@ namespace BBWY.Server.Model.Dto
/// <summary> /// <summary>
/// 是否包含售后单 /// 是否包含售后单
/// </summary> /// </summary>
public bool IsContainsAfterOrder { get;set; } public bool IsContainsAfterSaleOrder { get;set; }
} }
} }

2
BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs

@ -152,7 +152,7 @@ namespace BBWY.Server.Model.Dto
/// <summary> /// <summary>
/// 是否包含售后单 /// 是否包含售后单
/// </summary> /// </summary>
public bool IsAfterOrder { get; set; } public bool IsAfterSaleOrder { get; set; }
/// <summary> /// <summary>

5
BBWY.Server.Model/Dto/Response/Order/OrderSkuResponse.cs

@ -15,5 +15,10 @@
/// 代发信息Id /// 代发信息Id
/// </summary> /// </summary>
public long? OrderDropShippingId { get; set; } public long? OrderDropShippingId { get; set; }
/// <summary>
/// 是否退款
/// </summary>
public bool IsRefund { get; set; } = false;
} }
} }

Loading…
Cancel
Save