From 6c37e745b6535a7a5c9cc05035154dae35a3b235 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sun, 24 Jul 2022 11:58:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BD=93=E5=89=8D=E6=9D=A1=E4=BB=B6=E5=88=A9=E6=B6=A6?= =?UTF-8?q?=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Server.Business/Order/OrderBusiness.cs | 9 ++++++--- BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index e3847512..eb0b84e1 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -96,8 +96,10 @@ namespace BBWY.Server.Business .WhereIf(string.IsNullOrEmpty(searchOrderRequest.Waybill) == false, (o, ocs, oct) => o.WaybillNo == searchOrderRequest.Waybill); } - select = select.Where((o, ocs, oct) => o.ShopId == searchOrderRequest.ShopId) - .OrderByDescending((o, ocs, oct) => o.StartTime) + select = select.Where((o, ocs, oct) => o.ShopId == searchOrderRequest.ShopId); + var currentConditionsTotalProfit = select.ToAggregate((o, ocs, oct) => oct.Sum(oct.Key.Profit)); + + select = select.OrderByDescending((o, ocs, oct) => o.StartTime) .Count(out var total) .Page(searchOrderRequest.PageIndex, searchOrderRequest.PageSize); @@ -219,7 +221,8 @@ namespace BBWY.Server.Business var response = new OrderListResponse() { Count = total, - Items = orderList + Items = orderList, + CurrentConditionsTotalProfit = currentConditionsTotalProfit }; return response; } diff --git a/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs b/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs index 45268dce..bd4b7f4e 100644 --- a/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs +++ b/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs @@ -196,5 +196,10 @@ namespace BBWY.Server.Model.Dto public long Count { get; set; } public IList Items { get; set; } + + /// + /// 当前条件总利润 + /// + public decimal CurrentConditionsTotalProfit { get; set; } } }