From 7610219e5a4f3886afed8bb01fe863ada64ede77 Mon Sep 17 00:00:00 2001
From: sanji <sanji@tuanhuo.com>
Date: Thu, 16 Nov 2023 10:15:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=84=E4=BB=B7=E5=8A=A9?=
 =?UTF-8?q?=E6=89=8B=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0=E5=88=A4=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<PromotionTask>(request.TaskId).ToOne();
-
+            if (dbPromotionTask.IsEnabled == false)
+                return;
             fsql.Transaction(() =>
             {
                 //fsql.Delete<PromotionTask>(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<ApiResponse>(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<ApiResponse>(httpResult.Content);
+                if (!response.Success)
+                    throw new BusinessException($"【{dbPromotionTask.ActivityName}】评价助手活动删除成功,JD活动删除失败,请手动到JD后台删除,并通知技术员分析失败原因,{response.Msg}");
+            }
             //}
         }