diff --git a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs index d04bc9fb..3fae25d3 100644 --- a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs +++ b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs @@ -838,7 +838,8 @@ namespace BBWY.Server.Business .InnerJoin((osku, o) => osku.OrderId == o.Id) .WhereIf(shopId != null, (osku, o) => o.ShopId == shopId) .Where((osku, o) => validOrderStateList.Contains(o.OrderState.Value)) - .Where((osku, o) => osku.CreateTime >= querySkuTime) + //.Where((osku, o) => osku.CreateTime >= querySkuTime) + .Where((osku, o) => o.ModifyTime >= querySkuTime) .ToList((osku, o) => new OrderSku { CreateTime = osku.CreateTime, diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs index b1e85629..6753e8a9 100644 --- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs @@ -1103,7 +1103,16 @@ namespace BBWY.Server.Business stepText = "查询上架的赠品SKU"; searchProductSkuRequest.Sku = string.Join(",", giftSkuIdList); searchProductSkuRequest.CheckStep = "上架的赠品"; - giftSkuList = GetProductSkuList(searchProductSkuRequest); + try + { + giftSkuList = GetProductSkuList(searchProductSkuRequest); + } + catch + { + RollBackWhenStartPromotionError(request.AppKey, request.AppSecret, request.AppToken, giftSkuIdList, request.MainProductSpu, request.FullTitle, brandName, haveGiftTemplateSku); + throw; + } + #endregion }