1.订单同步支持暂停订单

2.今日业绩统计以开始时间为准并排除待付款和已取消

BBWY.Client/Models/Enums.cs

@@ -67,7 +67,8 @@
         待收货 = 3,
         已完成 = 4,
         锁定 = 5,
-        已取消 = 6
+        已取消 = 6,
+        暂停 = 7
     }
 
     /// <summary>

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.锁定;
                 }

BBWY.Server.Business/Statistics/StatisticsBusiness.cs

@@ -1,16 +1,20 @@
 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)
@@ -18,8 +22,9 @@ namespace BBWY.Server.Business
             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)
+                                                                            o.OrderState != null &&
+                                                                            !invalidOrderStateList.Contains(o.OrderState.Value) &&
+                                                                            o.StartTime >= today)
                                                          .ToAggregate((o, oc) => new ToDayOrderAchievementResponse()
                                                          {
                                                              OrderCount = o.Count(),

BBWY.Server.Model/Enums.cs

@@ -69,7 +69,8 @@
             待收货 = 3,
             已完成 = 4,
             锁定 = 5,
-            已取消 = 6
+            已取消 = 6,
+            暂停 = 7
         }
 
         /// <summary>