1

BBWY.Client/APIServices/StatisticsService.cs

@@ -38,9 +38,9 @@ namespace BBWY.Client.APIServices
         /// </summary>
         /// <param name="sdOperator"></param>
         /// <returns></returns>
-        public ApiResponse<SDGroupPersonStatisticsResponse> GetSDGroupPersonStatistics(string sdOperator)
+        public ApiResponse<SDGroupPersonStatisticsResponse> GetSDGroupPersonStatistics(string sdOperator, DateTime startDate, DateTime endDate)
         {
-            return SendRequest<SDGroupPersonStatisticsResponse>(globalContext.BBYWApiHost, $"/Api/Statistics/GetSDGroupPersonStatistics/{sdOperator}", null, null, HttpMethod.Get);
+            return SendRequest<SDGroupPersonStatisticsResponse>(globalContext.BBYWApiHost, "/Api/Statistics/GetSDGroupPersonStatistics", $"sdOperator={sdOperator}&startDate={startDate}&endDate={endDate}", null, HttpMethod.Get);
         }
     }
 }

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
         /// <summary>
         /// 当前条件利润汇总
         /// </summary>
-        public decimal CurrentConditionsTotalProfit { get => currentConditionsTotalProfit; set { Set(ref currentConditionsTotalProfit, value); } }
+        //public decimal CurrentConditionsTotalProfit { get => currentConditionsTotalProfit; set { Set(ref currentConditionsTotalProfit, value); } }
 
         /// <summary>
         /// 是否包含异常订单
@@ -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<IList<Order>>();
             App.Current.Dispatcher.Invoke(() =>
             {

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

BBWY.Client/Views/Order/OrderList.xaml

@@ -1543,13 +1543,13 @@
                 </b:Interaction.Triggers>
             </c:PageControl>
 
-            <TextBlock Grid.Row="8" 
+            <!--<TextBlock Grid.Row="8" 
                        HorizontalAlignment="Right" VerticalAlignment="Center" 
                        Margin="0,0,5,0"
                        Visibility="{Binding Visibility,ElementName=listbox_order}">
                 <Run Text="当前条件利润汇总"/>
                 <Run Text="{Binding CurrentConditionsTotalProfit,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
-            </TextBlock>
+            </TextBlock>-->
         </Grid>
     </Grid>
 </Page>

BBWY.Server.API/Controllers/StatisticsController.cs

@@ -67,11 +67,13 @@ namespace BBWY.Server.API.Controllers
         /// 刷单组个人统计
         /// </summary>
         /// <param name="sdOperator"></param>
+        /// <param name="startDate"></param>
+        /// <param name="endDate"></param>
         /// <returns></returns>
-        [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);
         }
     }
 }

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

BBWY.Server.Business/Statistics/StatisticsBusiness.cs

@@ -275,14 +275,20 @@ namespace BBWY.Server.Business
         /// SD组个人统计
         /// </summary>
         /// <param name="sdOperator"></param>
+        /// <param name="startDate"></param>
+        /// <param name="endDate"></param>
         /// <returns></returns>
-        public SDGroupPersonStatisticsResponse GetSDGroupPersonStatistics(string sdOperator)
+        public SDGroupPersonStatisticsResponse GetSDGroupPersonStatistics(string sdOperator, DateTime startDate, DateTime endDate)
         {
-            return fsql.Select<Order>().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<Order>().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)
+                                                   });
         }
     }
 }

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

@@ -202,9 +202,11 @@ namespace BBWY.Server.Model.Dto
 
         public IList<OrderResponse> Items { get; set; }
 
+        /*
         /// <summary>
         /// 当前条件总利润
         /// </summary>
         public decimal CurrentConditionsTotalProfit { get; set; }
+        */
     }
 }