From 7610219e5a4f3886afed8bb01fe863ada64ede77 Mon Sep 17 00:00:00 2001 From: sanji Date: Thu, 16 Nov 2023 10:15:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=84=E4=BB=B7?= =?UTF-8?q?=E5=8A=A9=E6=89=8B=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EvaluationAssistantBusiness.cs | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs index 76c3321d..af3e3369 100644 --- a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs +++ b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs @@ -699,7 +699,8 @@ namespace BBWY.Server.Business public void DeletePromotionTaskAndJDTask(DeletePromotionTaskRequest request) { var dbPromotionTask = fsql.Select(request.TaskId).ToOne(); - + if (dbPromotionTask.IsEnabled == false) + return; fsql.Transaction(() => { //fsql.Delete(request.TaskId).ExecuteAffrows(); @@ -709,23 +710,27 @@ namespace BBWY.Server.Business //if (dbPromotionTask.Status != Enums.PromitionTaskStatus.等待) //{ - var httpResult = restApiService.SendRequest(GetPlatformRelayAPIHost(Enums.Platform.京东), - "api/platformsdk/DeleteJDPromotionTask", - new DeleteJDPromotionTaskRequest() - { - AppKey = request.AppKey, - AppSecret = request.AppSecret, - AppToken = request.AppToken, - Platform = Enums.Platform.京东, - PromotionId = dbPromotionTask.PromotionId.Value - }, - GetYunDingRequestHeader(), - HttpMethod.Post); - if (httpResult.StatusCode != System.Net.HttpStatusCode.OK) - throw new BusinessException($"【{dbPromotionTask.ActivityName}】评价助手活动删除成功,JD活动删除失败,请手动到JD后台删除,并通知技术员分析失败原因,{httpResult.Content}"); - var response = JsonConvert.DeserializeObject(httpResult.Content); - if (!response.Success) - throw new BusinessException($"【{dbPromotionTask.ActivityName}】评价助手活动删除成功,JD活动删除失败,请手动到JD后台删除,并通知技术员分析失败原因,{response.Msg}"); + + if (dbPromotionTask.PromotionId != null && dbPromotionTask.PromotionId != 0) + { + var httpResult = restApiService.SendRequest(GetPlatformRelayAPIHost(Enums.Platform.京东), + "api/platformsdk/DeleteJDPromotionTask", + new DeleteJDPromotionTaskRequest() + { + AppKey = request.AppKey, + AppSecret = request.AppSecret, + AppToken = request.AppToken, + Platform = Enums.Platform.京东, + PromotionId = dbPromotionTask.PromotionId.Value + }, + GetYunDingRequestHeader(), + HttpMethod.Post); + if (httpResult.StatusCode != System.Net.HttpStatusCode.OK) + throw new BusinessException($"【{dbPromotionTask.ActivityName}】评价助手活动删除成功,JD活动删除失败,请手动到JD后台删除,并通知技术员分析失败原因,{httpResult.Content}"); + var response = JsonConvert.DeserializeObject(httpResult.Content); + if (!response.Success) + throw new BusinessException($"【{dbPromotionTask.ActivityName}】评价助手活动删除成功,JD活动删除失败,请手动到JD后台删除,并通知技术员分析失败原因,{response.Msg}"); + } //} } From 2e60e9d294df2ee911d90958dae6fb264142e271 Mon Sep 17 00:00:00 2001 From: sanji Date: Thu, 16 Nov 2023 15:26:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=A4=E5=AE=9A=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Server.Business/Statistics/StatisticsBusiness.cs | 2 +- BBWY.Server.Business/TestBusiness.cs | 1 + .../Dto/Request/Test/RepairSkuDetailAndSkuGriooProfit.cs | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs index c2012a44..66544873 100644 --- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs +++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs @@ -375,7 +375,7 @@ namespace BBWY.Server.Business o.IsGift == false && o.OrderState != Enums.OrderState.已取消 && ((o.StorageType != Enums.StorageType.SD && o.StorageType != null && oc.PurchaseAmount == 0M) || - (o.StorageType != Enums.StorageType.SD && oc.PurchaseAmount + oc.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice) || + (o.StorageType != Enums.StorageType.SD && oc.PurchaseAmount + oc.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice + o.PingTaiChengDanYouHuiQuan) || (o.StorageType == null && o.OrderState != Enums.OrderState.等待采购))).Count(); response.WaitOutStoreCount = fsql.Select().Where(o => o.ShopId == shopId && o.OrderState == Enums.OrderState.待出库 && o.StartTime >= dt && diff --git a/BBWY.Server.Business/TestBusiness.cs b/BBWY.Server.Business/TestBusiness.cs index 16f8a7a7..ca5dc753 100644 --- a/BBWY.Server.Business/TestBusiness.cs +++ b/BBWY.Server.Business/TestBusiness.cs @@ -189,6 +189,7 @@ namespace BBWY.Server.Business o.StartTime >= request.StartTime && o.StartTime <= request.EndTime) .WhereIf(!string.IsNullOrEmpty(request.OrderId), o => o.Id == request.OrderId) + .WhereIf(request.OrderIdList != null && request.OrderIdList.Count() > 0, o => request.OrderIdList.Contains(o.Id)) .OrderByDescending(o => o.StartTime) .ToList(o => o.Id); diff --git a/BBWY.Server.Model/Dto/Request/Test/RepairSkuDetailAndSkuGriooProfit.cs b/BBWY.Server.Model/Dto/Request/Test/RepairSkuDetailAndSkuGriooProfit.cs index 3f13cd05..763b2584 100644 --- a/BBWY.Server.Model/Dto/Request/Test/RepairSkuDetailAndSkuGriooProfit.cs +++ b/BBWY.Server.Model/Dto/Request/Test/RepairSkuDetailAndSkuGriooProfit.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; namespace BBWY.Server.Model.Dto { @@ -11,5 +12,7 @@ namespace BBWY.Server.Model.Dto public long? ShopId { get; set; } public string OrderId { get; set; } + + public List OrderIdList { get; set; } } } From ec86c22687ce0337c58f42bc9f0f3a7fe1341c57 Mon Sep 17 00:00:00 2001 From: sanji Date: Thu, 16 Nov 2023 15:29:28 +0800 Subject: [PATCH 3/3] 1 --- BBWY.Server.Business/Order/OrderBusiness.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index fddb1d02..1841caf1 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -80,7 +80,7 @@ namespace BBWY.Server.Business .WhereIf(searchOrderRequest.IncludeExceptionOrder, (o, ocs, oct, sh) => o.OrderState != Enums.OrderState.已取消 && ((o.StorageType != Enums.StorageType.SD && o.StorageType != null && oct.PurchaseAmount == 0M) || - (o.StorageType != Enums.StorageType.SD && oct.PurchaseAmount + oct.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice) || + (o.StorageType != Enums.StorageType.SD && oct.PurchaseAmount + oct.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice + o.PingTaiChengDanYouHuiQuan) || (o.StorageType == null && o.OrderState != Enums.OrderState.等待采购))) .WhereIf(searchOrderRequest.OnlyDF, (o, ocs, oct, sh) => o.StorageType == Enums.StorageType.代发) .WhereIf(searchOrderRequest.ExcludeCanceled, (o, ocs, oct, sh) => o.OrderState != Enums.OrderState.已取消)