From b611dc4eea87c02c8387beaab9845289a7f0ff39 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Thu, 7 Jul 2022 05:27:39 +0800 Subject: [PATCH] =?UTF-8?q?ordersku=E5=A2=9E=E5=8A=A0=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs | 2 +- .../Models/APIModel/Response/Order/OrderSkuResponse.cs | 2 ++ BBWY.Client/Models/Order/Order.cs | 2 +- BBWY.Client/Models/Order/OrderSku.cs | 5 +++++ BBWY.Server.Business/Order/OrderBusiness.cs | 4 ++-- BBWY.Server.Model/Db/Order/Order.cs | 2 +- BBWY.Server.Model/Db/Order/OrderSku.cs | 6 ++++++ BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs | 2 +- BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs | 2 +- BBWY.Server.Model/Dto/Response/Order/OrderSkuResponse.cs | 5 +++++ 10 files changed, 25 insertions(+), 7 deletions(-) diff --git a/BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs index c86d10a9..958b0b58 100644 --- a/BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/Order/OrderResponse.cs @@ -141,7 +141,7 @@ namespace BBWY.Client.Models /// /// 是否包含售后单 /// - public bool IsAfterOrder { get; set; } + public bool IsAfterSaleOrder { get; set; } /// /// 收货人信息 diff --git a/BBWY.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs index 01e22502..b7c01a5c 100644 --- a/BBWY.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs @@ -26,5 +26,7 @@ /// 代发信息Id /// public long? OrderDropShippingId { get; set; } + + public bool IsRefund { get; set; } = false; } } diff --git a/BBWY.Client/Models/Order/Order.cs b/BBWY.Client/Models/Order/Order.cs index 540d3240..eb85f5b9 100644 --- a/BBWY.Client/Models/Order/Order.cs +++ b/BBWY.Client/Models/Order/Order.cs @@ -162,7 +162,7 @@ namespace BBWY.Client.Models /// /// 是否包含售后单 /// - public bool IsAfterOrder { get; set; } + public bool IsAfterSaleOrder { get; set; } /// /// 收货人信息 diff --git a/BBWY.Client/Models/Order/OrderSku.cs b/BBWY.Client/Models/Order/OrderSku.cs index fdc5d725..4501e2ac 100644 --- a/BBWY.Client/Models/Order/OrderSku.cs +++ b/BBWY.Client/Models/Order/OrderSku.cs @@ -23,5 +23,10 @@ /// 代发信息Id /// public long? OrderDropShippingId { get; set; } + + /// + /// 是否退款 + /// + public bool IsRefund { get; set; } = false; } } diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index 3cd3a3c0..843b0274 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -90,7 +90,7 @@ namespace BBWY.Server.Business } 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) .Count(out var total) .Page(searchOrderRequest.PageIndex, searchOrderRequest.PageSize); @@ -123,7 +123,7 @@ namespace BBWY.Server.Business SDOperator = o.SDOperator, SDPayBillNo = o.SDPayBillNo, SDPayChannel = o.SDPayChannel, - IsAfterOrder = o.IsAfterOrder, + IsAfterSaleOrder = o.IsAfterSaleOrder, ContactName = ocs.ContactName, Address = ocs.Address, diff --git a/BBWY.Server.Model/Db/Order/Order.cs b/BBWY.Server.Model/Db/Order/Order.cs index 58c3417c..623a76f5 100644 --- a/BBWY.Server.Model/Db/Order/Order.cs +++ b/BBWY.Server.Model/Db/Order/Order.cs @@ -171,7 +171,7 @@ namespace BBWY.Server.Model.Db /// 是否为售后订单 /// [Column(DbType = "bit")] - public bool IsAfterOrder { get; set; } = false; + public bool IsAfterSaleOrder { get; set; } = false; #region 订单成本 /// diff --git a/BBWY.Server.Model/Db/Order/OrderSku.cs b/BBWY.Server.Model/Db/Order/OrderSku.cs index 68982858..a9f1cb95 100644 --- a/BBWY.Server.Model/Db/Order/OrderSku.cs +++ b/BBWY.Server.Model/Db/Order/OrderSku.cs @@ -55,6 +55,12 @@ namespace BBWY.Server.Model.Db /// [Column(DbType = "bigint(1)", IsNullable = true)] public long? OrderDropShippingId { get; set; } + + /// + /// 是否退款 + /// + [Column(DbType = "bit")] + public bool IsRefund { get; set; } = false; } } diff --git a/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs b/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs index 7e3e4d87..46138b18 100644 --- a/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs +++ b/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs @@ -56,7 +56,7 @@ namespace BBWY.Server.Model.Dto /// /// 是否包含售后单 /// - public bool IsContainsAfterOrder { get;set; } + public bool IsContainsAfterSaleOrder { get;set; } } } diff --git a/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs b/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs index a54f9b66..7546709a 100644 --- a/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs +++ b/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs @@ -152,7 +152,7 @@ namespace BBWY.Server.Model.Dto /// /// 是否包含售后单 /// - public bool IsAfterOrder { get; set; } + public bool IsAfterSaleOrder { get; set; } /// diff --git a/BBWY.Server.Model/Dto/Response/Order/OrderSkuResponse.cs b/BBWY.Server.Model/Dto/Response/Order/OrderSkuResponse.cs index af06e542..c2198e9a 100644 --- a/BBWY.Server.Model/Dto/Response/Order/OrderSkuResponse.cs +++ b/BBWY.Server.Model/Dto/Response/Order/OrderSkuResponse.cs @@ -15,5 +15,10 @@ /// 代发信息Id /// public long? OrderDropShippingId { get; set; } + + /// + /// 是否退款 + /// + public bool IsRefund { get; set; } = false; } }