SD个人统计

BBWY.Client/APIServices/StatisticsService.cs

@@ -17,7 +17,7 @@ namespace BBWY.Client.APIServices
         /// 今日业绩统计
         /// </summary>
         /// <returns></returns>
-        public ApiResponse<ToDayOrderAchievementResponse> GetTodayAchievementStatistics(DateTime startTime, DateTime endTime,long shopId)
+        public ApiResponse<ToDayOrderAchievementResponse> GetTodayAchievementStatistics(DateTime startTime, DateTime endTime, long shopId)
         {
             return SendRequest<ToDayOrderAchievementResponse>(globalContext.BBYWApiHost, "Api/Statistics/GetOrderAchievementStatistics", new
             {
@@ -32,5 +32,15 @@ namespace BBWY.Client.APIServices
         {
             return SendRequest<OrderCountStatisticsResponse>(globalContext.BBYWApiHost, "Api/Statistics/GetOrderCountStatistics", $"shopId={shopId}&startDate={startDate:yyyy-MM-dd}&endDate={endDate:yyyy-MM-dd}", null, HttpMethod.Get);
         }
+
+        /// <summary>
+        /// 刷单组个人统计
+        /// </summary>
+        /// <param name="sdOperator"></param>
+        /// <returns></returns>
+        public ApiResponse<SDGroupPersonStatisticsResponse> GetSDGroupPersonStatistics(string sdOperator)
+        {
+            return SendRequest<SDGroupPersonStatisticsResponse>(globalContext.BBYWApiHost, $"/Api/Statistics/GetSDGroupPersonStatistics/{sdOperator}", null, null, HttpMethod.Get);
+        }
     }
 }

BBWY.Client/App.xaml.cs

@@ -32,10 +32,10 @@ namespace BBWY.Client
             string userToken = string.Empty;
 #if DEBUG
             //齐越山鸡
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
+            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
 
             //刷单组测试
-            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs";
+            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs";
             //齐越愉辰
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTEyNDU1MzExNDYyNDAwIiwidGVhbUlkIjoiMTQzOTg5ODYxNzM1ODg0ODAwMCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUwNDA0ODZ9.0TvEhPzTeKvpQY31E5YhgfvRBJHYdvwWRrEHNnF9kkA";
             //齐越悠仁

BBWY.Client/Models/APIModel/Response/Statistics/SDGroupPersonStatisticsResponse.cs

@@ -0,0 +1,9 @@
+namespace BBWY.Client.Models
+{
+    public class SDGroupPersonStatisticsResponse
+    {
+        public int MySDCount { get; set; }
+
+        public decimal OrderPayment { get; set; }
+    }
+}

BBWY.Client/Models/MappingProfile.cs

@@ -28,7 +28,7 @@ namespace BBWY.Client.Models
 
             CreateMap<PurchaseOrderResponse, PurchaseOrder>();
             CreateMap<ToDayOrderAchievementResponse, ToDayOrderAchievement>();
-
+            CreateMap<SDGroupPersonStatisticsResponse, SDGroupPersonStatistics>();
         }
     }
 }

BBWY.Client/Models/Statistics/SDGroupPersonStatistics.cs

@@ -0,0 +1,12 @@
+namespace BBWY.Client.Models
+{
+    public class SDGroupPersonStatistics : NotifyObject
+    {
+        private int mySDCount;
+        private decimal orderPayment;
+
+        public int MySDCount { get => mySDCount; set { Set(ref mySDCount, value); } }
+
+        public decimal OrderPayment { get => orderPayment; set { Set(ref orderPayment, value); } }
+    }
+}

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -156,13 +156,13 @@ namespace BBWY.Client.ViewModels
             if (IsSDGroup)
             {
                 querySDOperator = globalContext.User.Name;
+                SDGroupInit();
             }
             else
             {
                 queryShopId = globalContext.User.Shop.ShopId;
             }
 
-            SDGroupInit();
             random = new Random();
             this.globalContext = globalContext;
             this.orderService = orderService;
@@ -359,7 +359,7 @@ namespace BBWY.Client.ViewModels
             }
             else
             {
-
+                Task.Factory.StartNew(()=> LoadSDGroupPersonStatistics());
             }
         }
 
@@ -504,7 +504,7 @@ namespace BBWY.Client.ViewModels
             }
             else if (storageType == StorageType.SD)
             {
-                var sd = new SD(orderId, true, order.VenderRemark, order.Flag, string.Empty, null, string.Empty, globalContext.User.Name, 0M, 0M, 0M);
+                var sd = new SD(orderId, true, order.VenderRemark, order.Flag, string.Empty, null, string.Empty, globalContext.User.Name, 0M, 0M, 0M, IsSDGroup ? SDType.刷单组 : SDType.自刷);
                 sd.Closed += Sd_Closed;
                 sd.ShowDialog();
             }

BBWY.Client/ViewModels/Order/OrderListViewModel_SDGroup.cs

@@ -22,12 +22,14 @@ namespace BBWY.Client.ViewModels
 
         public Shop SdGroupSelectedShop { get => sdGroupSelectedShop; set { Set(ref sdGroupSelectedShop, value); } }
 
+        public SDGroupPersonStatistics SDGroupPersonStatistics { get; set; }
 
         private void SDGroupInit()
         {
             SetSDButtinIndexCommand = new RelayCommand<int>(SetSDButtinIndex);
             SDGroupSelectedShopChangedCommand = new RelayCommand<OnShopChangedEventArgs>(SDGroupSelectedShopChanged);
             SDGroupPullCommand = new RelayCommand(SDGroupPull);
+            SDGroupPersonStatistics = new SDGroupPersonStatistics();
         }
 
         private void SetSDButtinIndex(int index)
@@ -71,5 +73,12 @@ namespace BBWY.Client.ViewModels
                 });
             });
         }
+
+        private void LoadSDGroupPersonStatistics()
+        {
+            var response = statisticsService.GetSDGroupPersonStatistics(querySDOperator);
+            if (response.Success)
+                response.Data.Map(SDGroupPersonStatistics);
+        }
     }
 }

BBWY.Client/Views/Order/SDGroup.xaml

@@ -135,6 +135,25 @@
                 </StackPanel>
             </Grid>
 
+            <Grid Grid.Row="2" HorizontalAlignment="Right" Width="200" Background="{StaticResource Button.Selected.Background}" TextBlock.Foreground="White"
+                  Visibility="{Binding SDGroupButtonIndex,ConverterParameter=1:Visible:Collapsed,Converter={StaticResource objConverter}}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">
+                        <Run Text="总单量"/>
+                        <LineBreak/>
+                        <Run Text="{Binding SDGroupPersonStatistics.MySDCount}" FontSize="20"/>
+                </TextBlock>
+
+                <TextBlock Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
+                        <Run Text="实付金额"/>
+                        <LineBreak/>
+                        <Run Text="{Binding SDGroupPersonStatistics.OrderPayment}" FontSize="20"/>
+                </TextBlock>
+            </Grid>
+
             <local:OrderListControl Grid.Row="4"/>
 
             <c:PageControl PageIndex="{Binding PageIndex}"

BBWY.Server.API/Controllers/StatisticsController.cs

@@ -58,9 +58,20 @@ namespace BBWY.Server.API.Controllers
         /// <param name="endDate"></param>
         /// <returns></returns>
         [HttpGet]
-        public OrderCountStatisticsResponse GetOrderCountStatistics([FromQuery]long shopId, [FromQuery]DateTime startDate, [FromQuery]DateTime endDate)
+        public OrderCountStatisticsResponse GetOrderCountStatistics([FromQuery] long shopId, [FromQuery] DateTime startDate, [FromQuery] DateTime endDate)
-        { 
+        {
-        return statisticsBusiness.GetOrderCountStatistics(shopId, startDate, endDate);
+            return statisticsBusiness.GetOrderCountStatistics(shopId, startDate, endDate);
+        }
+
+        /// <summary>
+        /// 刷单组个人统计
+        /// </summary>
+        /// <param name="sdOperator"></param>
+        /// <returns></returns>
+        [HttpGet("{sdOperator}")]
+        public SDGroupPersonStatisticsResponse GetSDGroupPersonStatistics([FromRoute] string sdOperator)
+        {
+            return statisticsBusiness.GetSDGroupPersonStatistics(sdOperator);
         }
     }
 }

BBWY.Server.Business/Statistics/StatisticsBusiness.cs

@@ -270,5 +270,19 @@ namespace BBWY.Server.Business
                                                              (o.StorageType == null && o.OrderState != Enums.OrderState.等待采购))).Count();
             return response;
         }
+
+        /// <summary>
+        /// SD组个人统计
+        /// </summary>
+        /// <param name="sdOperator"></param>
+        /// <returns></returns>
+        public SDGroupPersonStatisticsResponse GetSDGroupPersonStatistics(string sdOperator)
+        {
+            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)
+            });
+        }
     }
 }

BBWY.Server.Model/Dto/Response/Statistics/SDGroupPersonStatisticsResponse.cs

@@ -0,0 +1,15 @@
+namespace BBWY.Server.Model.Dto
+{
+    public class SDGroupPersonStatisticsResponse
+    {
+        /// <summary>
+        /// 我的总刷单量
+        /// </summary>
+        public int MySDCount { get; set; }
+
+        /// <summary>
+        /// 实付金额
+        /// </summary>
+        public decimal OrderPayment { get; set; }
+    }
+}