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}"); + } //} }