diff --git a/BBWY.Client/APIServices/StatisticsService.cs b/BBWY.Client/APIServices/StatisticsService.cs
index 3efe0543..2b1e318d 100644
--- a/BBWY.Client/APIServices/StatisticsService.cs
+++ b/BBWY.Client/APIServices/StatisticsService.cs
@@ -38,9 +38,9 @@ namespace BBWY.Client.APIServices
///
///
///
- public ApiResponse GetSDGroupPersonStatistics(string sdOperator)
+ public ApiResponse GetSDGroupPersonStatistics(string sdOperator, DateTime startDate, DateTime endDate)
{
- return SendRequest(globalContext.BBYWApiHost, $"/Api/Statistics/GetSDGroupPersonStatistics/{sdOperator}", null, null, HttpMethod.Get);
+ return SendRequest(globalContext.BBYWApiHost, "/Api/Statistics/GetSDGroupPersonStatistics", $"sdOperator={sdOperator}&startDate={startDate}&endDate={endDate}", null, HttpMethod.Get);
}
}
}
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index d161d960..68b5541f 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -48,7 +48,7 @@ namespace BBWY.Client.ViewModels
public GlobalContext globalContext { get; set; }
private bool? includeAfterOrder;
private bool includeExceptionOrder;
- private decimal currentConditionsTotalProfit;
+ //private decimal currentConditionsTotalProfit;
private string searchServiceId;
private long waitPurchaseOrderCount;
private long exceptionOrderCount;
@@ -135,7 +135,7 @@ namespace BBWY.Client.ViewModels
///
/// 当前条件利润汇总
///
- public decimal CurrentConditionsTotalProfit { get => currentConditionsTotalProfit; set { Set(ref currentConditionsTotalProfit, value); } }
+ //public decimal CurrentConditionsTotalProfit { get => currentConditionsTotalProfit; set { Set(ref currentConditionsTotalProfit, value); } }
///
/// 是否包含异常订单
@@ -391,7 +391,7 @@ namespace BBWY.Client.ViewModels
return;
}
OrderCount = response.Data.Count;
- CurrentConditionsTotalProfit = response.Data.CurrentConditionsTotalProfit;
+ //CurrentConditionsTotalProfit = response.Data.CurrentConditionsTotalProfit;
var orderList = response.Data.Items.Map>();
App.Current.Dispatcher.Invoke(() =>
{
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel_SDGroup.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel_SDGroup.cs
index afdb46d3..6f523c4a 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel_SDGroup.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel_SDGroup.cs
@@ -76,7 +76,7 @@ namespace BBWY.Client.ViewModels
private void LoadSDGroupPersonStatistics()
{
- var response = statisticsService.GetSDGroupPersonStatistics(querySDOperator);
+ var response = statisticsService.GetSDGroupPersonStatistics(querySDOperator, StartDate, EndDate);
if (response.Success)
response.Data.Map(SDGroupPersonStatistics);
}
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 17fac28b..b8c233a4 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -1543,13 +1543,13 @@
-
-
+ -->
diff --git a/BBWY.Server.API/Controllers/StatisticsController.cs b/BBWY.Server.API/Controllers/StatisticsController.cs
index 4ac10f24..5269ae42 100644
--- a/BBWY.Server.API/Controllers/StatisticsController.cs
+++ b/BBWY.Server.API/Controllers/StatisticsController.cs
@@ -67,11 +67,13 @@ namespace BBWY.Server.API.Controllers
/// 刷单组个人统计
///
///
+ ///
+ ///
///
- [HttpGet("{sdOperator}")]
- public SDGroupPersonStatisticsResponse GetSDGroupPersonStatistics([FromRoute] string sdOperator)
+ [HttpGet]
+ public SDGroupPersonStatisticsResponse GetSDGroupPersonStatistics(string sdOperator, DateTime startDate, DateTime endDate)
{
- return statisticsBusiness.GetSDGroupPersonStatistics(sdOperator);
+ return statisticsBusiness.GetSDGroupPersonStatistics(sdOperator, startDate, endDate);
}
}
}
diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index dc0bd96d..d5c1d4ea 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -159,8 +159,8 @@ namespace BBWY.Server.Business
searchOrderRequest.EndDate = searchOrderRequest.EndDate.Value.Date.AddDays(1).AddSeconds(-1);
- var noCancelSelect = GetOrderListQueryConditions(searchOrderRequest);
- var currentConditionsTotalProfit = noCancelSelect.Where((o, ocs, oct) => o.OrderState != Enums.OrderState.已取消).ToAggregate((o, ocs, oct) => oct.Sum(oct.Key.Profit));
+ //var noCancelSelect = GetOrderListQueryConditions(searchOrderRequest);
+ //var currentConditionsTotalProfit = noCancelSelect.Where((o, ocs, oct) => o.OrderState != Enums.OrderState.已取消).ToAggregate((o, ocs, oct) => oct.Sum(oct.Key.Profit));
var select = GetOrderListQueryConditions(searchOrderRequest).OrderByDescending((o, ocs, oct) => o.StartTime)
.Count(out var total)
@@ -224,7 +224,7 @@ namespace BBWY.Server.Business
{
Count = total,
Items = orderList,
- CurrentConditionsTotalProfit = currentConditionsTotalProfit
+ //CurrentConditionsTotalProfit = currentConditionsTotalProfit
};
return response;
}
diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
index e2402686..47a5500c 100644
--- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
+++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
@@ -275,14 +275,20 @@ namespace BBWY.Server.Business
/// SD组个人统计
///
///
+ ///
+ ///
///
- public SDGroupPersonStatisticsResponse GetSDGroupPersonStatistics(string sdOperator)
+ public SDGroupPersonStatisticsResponse GetSDGroupPersonStatistics(string sdOperator, DateTime startDate, DateTime endDate)
{
- return fsql.Select().Where(o => o.StorageType == Enums.StorageType.SD && o.SDOperator == sdOperator).ToAggregate(g => new SDGroupPersonStatisticsResponse
- {
- MySDCount = g.Count(),
- OrderPayment = g.Sum(g.Key.OrderPayment)
- });
+ endDate = endDate.Date.AddDays(1).AddSeconds(-1);
+ return fsql.Select().Where(o => o.StorageType == Enums.StorageType.SD &&
+ o.SDOperator == sdOperator &&
+ o.StartTime >= startDate &&
+ o.StartTime <= endDate).ToAggregate(g => new SDGroupPersonStatisticsResponse
+ {
+ MySDCount = g.Count(),
+ OrderPayment = g.Sum(g.Key.OrderPayment)
+ });
}
}
}
diff --git a/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs b/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs
index 6a2fc20b..7871095b 100644
--- a/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs
+++ b/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs
@@ -202,9 +202,11 @@ namespace BBWY.Server.Model.Dto
public IList Items { get; set; }
+ /*
///
/// 当前条件总利润
///
public decimal CurrentConditionsTotalProfit { get; set; }
+ */
}
}