1

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

@@ -5,5 +5,9 @@
         public long WaitPurchaseCount { get; set; }
 
         public long ExceptionCount { get; set; }
+
+        public long WaitOutStoreCount { get; set; }
+
+        public long AfterSaleOrderUnhandleCount { get; set; }
     }
 }

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -52,6 +52,9 @@ namespace BBWY.Client.ViewModels
         private string searchServiceId;
         private long waitPurchaseOrderCount;
         private long exceptionOrderCount;
+        private long waitOutStoreCount;
+        private long afterSaleOrderUnhandleCount;
+
         private long? queryShopId;
         private string querySDOperator;
         private bool isSDGroup;
@@ -144,12 +147,16 @@ namespace BBWY.Client.ViewModels
 
         public long WaitPurchaseOrderCount { get => waitPurchaseOrderCount; set { Set(ref waitPurchaseOrderCount, value); } }
         public long ExceptionOrderCount { get => exceptionOrderCount; set { Set(ref exceptionOrderCount, value); } }
+        public long WaitOutStoreCount { get => waitOutStoreCount; set { Set(ref waitOutStoreCount, value); } }
+        public long AfterSaleOrderUnhandleCount { get => afterSaleOrderUnhandleCount; set { Set(ref afterSaleOrderUnhandleCount, value); } }
 
         /// <summary>
         /// 是否为刷单组
         /// </summary>
         public bool IsSDGroup { get => isSDGroup; set { Set(ref isSDGroup, value); } }
 
+
+
         public OrderListViewModel(OrderService orderService, StatisticsService statisticsService, AfterOrderService afterOrderService, GlobalContext globalContext, ChoosePurchaseSchemeViewModel choosePurchaseSchemeViewModel)
         {
             IsSDGroup = globalContext.User.TeamName == "刷单组";
@@ -486,6 +493,8 @@ namespace BBWY.Client.ViewModels
                 return;
             WaitPurchaseOrderCount = response.Data.WaitPurchaseCount;
             ExceptionOrderCount = response.Data.ExceptionCount;
+            WaitOutStoreCount = response.Data.WaitOutStoreCount;
+            AfterSaleOrderUnhandleCount = response.Data.AfterSaleOrderUnhandleCount;
         }
 
         private void DecodeConsignee(Order order)

BBWY.Server.API/Controllers/StatisticsController.cs

@@ -54,13 +54,11 @@ namespace BBWY.Server.API.Controllers
         /// bbwy订单选项卡数量统计
         /// </summary>
         /// <param name="shopId"></param>
-        /// <param name="startDate"></param>
-        /// <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)
         {
-            return statisticsBusiness.GetOrderCountStatistics(shopId, startDate, endDate);
+            return statisticsBusiness.GetOrderCountStatistics(shopId);
         }
 
         /// <summary>

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -546,12 +546,6 @@ namespace BBWY.Server.Business
                     DeliveryExpressFreight = orderDeliveryExpressFreight,
                     CreateTime = DateTime.Now
                 };
-                //orderCost.PlatformCommissionAmount = dbOrder.OrderSellerPrice * orderCost.PlatformCommissionRatio;
-                //orderCost.Profit = dbOrder.OrderSellerPrice +
-                //                   dbOrder.FreightPrice -
-                //                   orderCost.PurchaseAmount -
-                //                   orderCost.DeliveryExpressFreight -
-                //                   orderCost.PlatformCommissionAmount;
                 orderCost.CalculationOrderProfitAndCost(dbOrder, dbAfterSaleOrderList);
                 insertOrderCost = fsql.Insert(orderCost);
                 #endregion
@@ -560,11 +554,6 @@ namespace BBWY.Server.Business
             {
                 orderCost.PurchaseAmount += orderCostPurchaseAmount;
                 orderCost.DeliveryExpressFreight += orderDeliveryExpressFreight;
-                //orderCost.Profit = dbOrder.OrderSellerPrice +
-                //                   dbOrder.FreightPrice -
-                //                   orderCost.PurchaseAmount -
-                //                   orderCost.DeliveryExpressFreight -
-                //                   orderCost.PlatformCommissionAmount;
                 orderCost.CalculationOrderProfitAndCost(dbOrder, dbAfterSaleOrderList);
                 updateOrderCost = fsql.Update<OrderCost>().SetSource(orderCost);
             }

BBWY.Server.Business/Statistics/StatisticsBusiness.cs

@@ -288,22 +288,24 @@ namespace BBWY.Server.Business
         /// <param name="startDate"></param>
         /// <param name="endDate"></param>
         /// <returns></returns>
-        public OrderCountStatisticsResponse GetOrderCountStatistics(long shopId, DateTime startDate, DateTime endDate)
+        public OrderCountStatisticsResponse GetOrderCountStatistics(long shopId)
         {
-            startDate = startDate.Date;
-            endDate = endDate.Date.AddDays(1).AddSeconds(-1);
+            //startDate = startDate.Date;
+            //endDate = endDate.Date.AddDays(1).AddSeconds(-1);
             var response = new OrderCountStatisticsResponse();
             response.WaitPurchaseCount = fsql.Select<Order>().Where(o => o.ShopId == shopId &&
-                                                                         o.StartTime >= startDate &&
-                                                                         o.StartTime <= endDate &&
                                                                          o.OrderState == Enums.OrderState.等待采购).Count();
 
             response.ExceptionCount = fsql.Select<Order, OrderCost>().LeftJoin((o, oc) => o.Id == oc.OrderId)
-                                          .Where((o, oc) => o.ShopId == shopId && o.StartTime >= startDate && o.StartTime <= endDate &&
+                                          .Where((o, oc) => o.ShopId == shopId && 
                                                             o.OrderState != Enums.OrderState.已取消 &&
                                                             ((o.StorageType != Enums.StorageType.SD && o.StorageType != null && oc.PurchaseAmount == 0M) ||
                                                              (o.StorageType != Enums.StorageType.SD && oc.PurchaseAmount + oc.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice) ||
                                                              (o.StorageType == null && o.OrderState != Enums.OrderState.等待采购))).Count();
+
+            response.WaitOutStoreCount = fsql.Select<Order>().Where(o => o.ShopId == shopId && o.OrderState == Enums.OrderState.待出库).Count();
+
+            response.AfterSaleOrderUnhandleCount = fsql.Select<AfterSaleOrder>().Where(aso => aso.ProductHealth == null || aso.ProductResult == null).Count();
             return response;
         }
 

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

@@ -5,5 +5,9 @@
         public long WaitPurchaseCount { get; set; }
 
         public long ExceptionCount { get; set; }
+
+        public long WaitOutStoreCount { get; set; }
+
+        public long AfterSaleOrderUnhandleCount { get; set; }
     }
 }