From c3288ed6e12e2c18c82bc0715f8c1c6dca60632e Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sat, 4 Mar 2023 17:08:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E8=B5=A0=E5=93=81?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=A4=B1=E8=B4=A5=E5=A2=9E=E5=8A=A0=E5=9B=9E?= =?UTF-8?q?=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Server.Business/PlatformSDK/JDBusiness.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 } From d4d230d0a85eb4385d97478f3d0475942dbbf8c9 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sun, 5 Mar 2023 15:31:48 +0800 Subject: [PATCH 2/2] 1 --- .../EvaluationAssistant/EvaluationAssistantBusiness.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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,