From f12427af7b2efb50f7b7c3f3d59de9853b519bfd Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Wed, 19 Jan 2022 16:48:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=AE=A2=E5=8D=95=E5=90=8C=E6=AD=A5=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=9A=82=E5=81=9C=E8=AE=A2=E5=8D=95=202.=E4=BB=8A?=
 =?UTF-8?q?=E6=97=A5=E4=B8=9A=E7=BB=A9=E7=BB=9F=E8=AE=A1=E4=BB=A5=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E6=97=B6=E9=97=B4=E4=B8=BA=E5=87=86=E5=B9=B6=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4=E5=BE=85=E4=BB=98=E6=AC=BE=E5=92=8C=E5=B7=B2=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/Models/Enums.cs                         |  3 ++-
 BBWY.Server.Business/Order/OrderBusiness.cs         |  6 +++++-
 .../Statistics/StatisticsBusiness.cs                | 13 +++++++++----
 BBWY.Server.Model/Enums.cs                          |  3 ++-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs
index 58b285be..a5284ba7 100644
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@@ -67,7 +67,8 @@
         待收货 = 3,
         已完成 = 4,
         锁定 = 5,
-        已取消 = 6
+        已取消 = 6,
+        暂停 = 7
     }
 
     /// <summary>
diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index 428e7100..68c71206 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -710,6 +710,10 @@ namespace BBWY.Server.Business
                 {
                     orderState = Enums.OrderState.已取消;
                 }
+                else if (jdOrderState.Equals("POP_ORDER_PAUSE") || jdOrderState.Equals("PAUSE"))
+                {
+                    orderState = Enums.OrderState.暂停;
+                }
                 #endregion
 
                 #region FBP状态翻译
@@ -725,7 +729,7 @@ namespace BBWY.Server.Business
                 {
                     orderState = Enums.OrderState.已完成;
                 }
-                else if (jdOrderState.Equals("SuoDing"))
+                else if (jdOrderState.Equals("SuoDing") || jdOrderState.Equals("LOCKED"))
                 {
                     orderState = Enums.OrderState.锁定;
                 }
diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
index f492f0d1..0839e1f8 100644
--- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
+++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
@@ -1,25 +1,30 @@
 using BBWY.Common.Models;
+using BBWY.Server.Model;
 using BBWY.Server.Model.Db;
 using BBWY.Server.Model.Dto;
 using System;
+using System.Collections.Generic;
 using Yitter.IdGenerator;
 
 namespace BBWY.Server.Business
 {
     public class StatisticsBusiness : BaseBusiness, IDenpendency
     {
+        private IList<Enums.OrderState> invalidOrderStateList;
+
         public StatisticsBusiness(IFreeSql fsql, NLog.ILogger logger, IIdGenerator idGenerator) : base(fsql, logger, idGenerator)
         {
-
+            invalidOrderStateList = new List<Enums.OrderState>() { Enums.OrderState.待付款, Enums.OrderState.已取消 };
         }
 
         public ToDayOrderAchievementResponse GetTodayAchievementStatistics(ToDayOrderAchievementRequest request)
         {
             var today = DateTime.Now.Date;
             var response = fsql.Select<Order, OrderCost>().InnerJoin((o, oc) => o.Id == oc.OrderId)
-                                                         .Where((o, oc) => o.ShopId == request.ShopId &&
-                                                                           o.OrderState == Model.Enums.OrderState.已完成 &&
-                                                                           o.EndTime >= today)
+                                                          .Where((o, oc) => o.ShopId == request.ShopId &&
+                                                                            o.OrderState != null &&
+                                                                            !invalidOrderStateList.Contains(o.OrderState.Value) &&
+                                                                            o.StartTime >= today)
                                                          .ToAggregate((o, oc) => new ToDayOrderAchievementResponse()
                                                          {
                                                              OrderCount = o.Count(),
diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs
index 5c3758f3..3fbe8f3a 100644
--- a/BBWY.Server.Model/Enums.cs
+++ b/BBWY.Server.Model/Enums.cs
@@ -69,7 +69,8 @@
             待收货 = 3,
             已完成 = 4,
             锁定 = 5,
-            已取消 = 6
+            已取消 = 6,
+            暂停 = 7
         }
 
         /// <summary>