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 } /// 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 invalidOrderStateList; + public StatisticsBusiness(IFreeSql fsql, NLog.ILogger logger, IIdGenerator idGenerator) : base(fsql, logger, idGenerator) { - + invalidOrderStateList = new List() { Enums.OrderState.待付款, Enums.OrderState.已取消 }; } public ToDayOrderAchievementResponse GetTodayAchievementStatistics(ToDayOrderAchievementRequest request) { var today = DateTime.Now.Date; var response = fsql.Select().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 } ///