|
|
@ -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; |
|
|
|
} |
|
|
|