1.C端订单sku导出增加商家优惠,平台优惠,订单状态

2.C端采购单列表增加状态数统计

BBWY.Client/Models/APIModel/Response/Order/ExportOrderSkuResponse.cs

@@ -31,9 +31,21 @@ namespace BBWY.Client.Models
 
         public string SpuName { get; set; }
 
+        public OrderState? OrderState { get; set; }
+
+        /// <summary>
+        /// 平台补贴
+        /// </summary>
+        public decimal? PreferentialAmount { get; set; }
+
+        /// <summary>
+        /// 商家优惠金额
+        /// </summary>
+        public decimal? SellerPreferentialAmount { get; set; }
+
         public override string ToString()
         {
-            return $"{StartTime},{ShopName},{OrderId},{Spu},{Sku},{StorageType},{PurchaseAmount},{SkuPrice},{ItemTotal},{SpuName}";
+            return $"{StartTime},{ShopName},{OrderId},{OrderState},{Spu},{Sku},{StorageType},{PurchaseAmount},{PreferentialAmount},{SellerPreferentialAmount},{SkuPrice},{ItemTotal},{SpuName}";
         }
     }
 

BBWY.Client/ViewModels/Order/ExportOrderSkuViewModel.cs

@@ -203,7 +203,7 @@ namespace BBWY.Client.ViewModels
                                                                try
                                                                {
                                                                    var list = response.Data.Select(x => x.ToString()).ToList();
-                                                                   list.Insert(0, "开始时间,店铺名称,订单Id,SPU,SKU,仓储类型,采购成本(货款+运费),单价,数量,商品标题");
+                                                                   list.Insert(0, "开始时间,店铺名称,订单Id,订单状态,SPU,SKU,仓储类型,采购成本(货款+运费),平台优惠,商家优惠,单价,数量,商品标题");
                                                                    System.IO.File.WriteAllLines(ssaveFileName, list, Encoding.UTF8);
                                                                    App.Current.Dispatcher.Invoke(() => MessageBox.Show("导出完成", "导出"));
                                                                }

BBWY.Client/Views/Order/ExportOrderSkuView.xaml

@@ -120,6 +120,10 @@
                                         ElementStyle="{StaticResource middleTextBlock}"
                                         HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"
                                         Width="110"/>
+                    <DataGridTextColumn Binding="{Binding OrderState,Mode=OneWay}" Header="订单状态" 
+                                        ElementStyle="{StaticResource middleTextBlock}"
+                                        HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"
+                                       Width="70"/>
                     <DataGridTextColumn Binding="{Binding Spu}" Header="SPU" 
                                         ElementStyle="{StaticResource middleTextBlock}"
                                         HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"
@@ -135,7 +139,15 @@
                     <DataGridTextColumn Binding="{Binding PurchaseAmount,Mode=OneWay}" Header="采购成本" 
                                         ElementStyle="{StaticResource middleTextBlock}"
                                         HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"
-                                       Width="80"/>
+                                       Width="60"/>
+                    <DataGridTextColumn Binding="{Binding PreferentialAmount,Mode=OneWay}" Header="平台优惠" 
+                                        ElementStyle="{StaticResource middleTextBlock}"
+                                        HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"
+                                       Width="60"/>
+                    <DataGridTextColumn Binding="{Binding SellerPreferentialAmount,Mode=OneWay}" Header="商家优惠" 
+                                        ElementStyle="{StaticResource middleTextBlock}"
+                                        HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"
+                                       Width="60"/>
                     <DataGridTextColumn Binding="{Binding SkuPrice}" Header="单价" 
                                         ElementStyle="{StaticResource middleTextBlock}"
                                         HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"

BBWY.Server.API/Controllers/StatisticsController.cs

@@ -61,6 +61,17 @@ namespace BBWY.Server.API.Controllers
             return statisticsBusiness.GetOrderCountStatistics(shopId);
         }
 
+        /// <summary>
+        /// 统计采购单各状态数量
+        /// </summary>
+        /// <param name="shopId"></param>
+        /// <returns></returns>
+        [HttpGet("{shopId}")]
+        public PurchaseOrderCountStatisticsResponse GetPurchaseOrderCountStatistics([FromRoute] long shopId)
+        {
+            return statisticsBusiness.GetPurchaseOrderCountStatistics(shopId);
+        }
+
         /// <summary>
         /// 刷单组个人统计
         /// </summary>

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -1138,7 +1138,10 @@ namespace BBWY.Server.Business
                 Spu = osku.ProductId,
                 SpuName = p.Title,
                 StartTime = o.StartTime,
-                StorageType = o.StorageType
+                StorageType = o.StorageType,
+                OrderState = o.OrderState,
+                PreferentialAmount = o.PreferentialAmount,
+                SellerPreferentialAmount = o.SellerPreferentialAmount
             };
         }
 

BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

@@ -1088,5 +1088,7 @@ namespace BBWY.Server.Business
             return new UpdatePackStateResponse();
         }
 
+
+
     }
 }

BBWY.Server.Business/Statistics/StatisticsBusiness.cs

@@ -314,6 +314,30 @@ namespace BBWY.Server.Business
             return response;
         }
 
+        public PurchaseOrderCountStatisticsResponse GetPurchaseOrderCountStatistics(long shopId)
+        {
+            var list = fsql.Select<PurchaseOrderV2>().Where(po => po.ShopId == shopId)
+                           .GroupBy(po => po.OrderState)
+                           .ToList(g => new
+                           {
+                               Count = g.Count(),
+                               OrderState = g.Key
+                           });
+
+            var response = new PurchaseOrderCountStatisticsResponse()
+            {
+                WaitPayCount = list.FirstOrDefault(x => x.OrderState == Enums.PurchaseOrderState.待付款)?.Count ?? 0,
+                CancelCount = list.FirstOrDefault(x => x.OrderState == Enums.PurchaseOrderState.已取消)?.Count ?? 0,
+                CompletedCount = list.FirstOrDefault(x => x.OrderState == Enums.PurchaseOrderState.已完成)?.Count ?? 0,
+                WaitCheckCount = list.FirstOrDefault(x => x.OrderState == Enums.PurchaseOrderState.待验收)?.Count ?? 0,
+                WaitComputationCount = list.FirstOrDefault(x => x.OrderState == Enums.PurchaseOrderState.待核算)?.Count ?? 0,
+                WaitPurchaseCount = list.FirstOrDefault(x => x.OrderState == Enums.PurchaseOrderState.等待采购 || x.OrderState == Enums.PurchaseOrderState.部分采购)?.Count ?? 0,
+                WaitShippment = list.FirstOrDefault(x => x.OrderState == Enums.PurchaseOrderState.待发货 || x.OrderState == Enums.PurchaseOrderState.部分发货)?.Count ?? 0,
+                WaitReceiveCount = list.FirstOrDefault(x => x.OrderState == Enums.PurchaseOrderState.待收货 || x.OrderState == Enums.PurchaseOrderState.部分收货)?.Count ?? 0
+            };
+            return response;
+        }
+
         /// <summary>
         /// SD组个人统计
         /// </summary>

BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs

@@ -114,9 +114,6 @@ namespace BBWY.Server.Model.Db
 
         public bool? IsSubscribeKuaiDi100 { get; set; } = false;
 
-        /// <summary>
-        /// 采购单状态(待付款=0,待发货=1,待收货=2,待质检=3,待打包=4,待结算=5,已完成=6)
-        /// </summary>
         [Column(MapType = typeof(int?))]
         public Enums.PurchaseOrderState? OrderState { get; set; }
 

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

@@ -28,6 +28,19 @@ namespace BBWY.Server.Model.Dto
         public int? ItemTotal { get; set; }
 
         public string SpuName { get; set; }
+
+        public Enums.OrderState? OrderState { get; set; }
+
+        /// <summary>
+        /// 平台补贴
+        /// </summary>
+        public decimal? PreferentialAmount { get; set; }
+
+        /// <summary>
+        /// 商家优惠金额
+        /// </summary>
+        public decimal? SellerPreferentialAmount { get; set; }
+
     }
 
     public class ExportOrderSkuListResponse

BBWY.Server.Model/Dto/Response/PurchaseOrderV2/PurchaseOrderCountStatisticsResponse.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Server.Model.Dto
+{
+    public class PurchaseOrderCountStatisticsResponse
+    {
+        /// <summary>
+        /// 等待付款数量
+        /// </summary>
+        public long WaitPayCount { get; set; }
+
+        /// <summary>
+        /// 等待采购数量(含部分采购)
+        /// </summary>
+        public long WaitPurchaseCount { get; set; }
+
+        /// <summary>
+        /// 等待发货数量(含部分发货)
+        /// </summary>
+        public long WaitShippment { get; set; }
+
+        /// <summary>
+        /// 等待收货数量(含部分收货)
+        /// </summary>
+        public long WaitReceiveCount { get; set; }
+
+        /// <summary>
+        /// 已完成数量
+        /// </summary>
+        public long CompletedCount { get; set; }
+
+        /// <summary>
+        /// 已取消数量
+        /// </summary>
+        public long CancelCount { get; set; }
+
+        /// <summary>
+        /// 待验收数量
+        /// </summary>
+        public long WaitCheckCount { get; set; }
+
+        /// <summary>
+        /// 待核算数量
+        /// </summary>
+        public long WaitComputationCount { get; set; }
+    }
+}