From a0d622ce360b6128b948f85150572f2f8dd1bfe6 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Mon, 6 Feb 2023 05:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE=E4=B8=8B?=
 =?UTF-8?q?=E4=B8=80=E8=BD=AE=E5=BC=80=E5=A7=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EvaluationAssistantBusiness.cs            | 30 ++++++++++---------
 .../PromotionTask/EditPreTaskRequest.cs       |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
index a5f8ac59..342d88af 100644
--- a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
+++ b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
@@ -303,26 +303,28 @@ namespace BBWY.Server.Business
             if (pt == null)
                 throw new BusinessException($"{request.TaskId}任务不存在");
 
-            var prpt = fsql.Select<PromotionTask>(request.PreTaskId).ToOne();
-            if (prpt == null)
-                throw new BusinessException($"{request.PreTaskId}前置任务不存在");
+            if (request.PreTaskId != -1)
+            {
+                var prpt = fsql.Select<PromotionTask>(request.PreTaskId).ToOne();
+                if (prpt == null)
+                    throw new BusinessException($"{request.PreTaskId}前置任务不存在");
 
-            if (pt.Id == prpt.Id)
-                throw new BusinessException("前置任务不能设置为自己");
+                if (pt.Id == prpt.Id)
+                    throw new BusinessException("前置任务不能设置为自己");
 
-            if (pt.Status != Enums.PromitionTaskStatus.等待)
-                throw new BusinessException("任务状态必须为等待");
+                if (pt.Status != Enums.PromitionTaskStatus.等待)
+                    throw new BusinessException("任务状态必须为等待");
 
-            if (prpt.Status != Enums.PromitionTaskStatus.等待 && prpt.Status != Enums.PromitionTaskStatus.进行中)
-                throw new BusinessException("前置任务状态必须为等待或进行中");
+                if (prpt.Status != Enums.PromitionTaskStatus.等待 && prpt.Status != Enums.PromitionTaskStatus.进行中)
+                    throw new BusinessException("前置任务状态必须为等待或进行中");
 
-            var nextPromotionTaskList = fsql.Select<PromotionTask>().Where(pt1 => pt1.PreTaskId == request.PreTaskId).ToList();
-            if (nextPromotionTaskList.Count() > 0)
-            {
-                CheckSkuRepeat(pt, nextPromotionTaskList);
+                var nextPromotionTaskList = fsql.Select<PromotionTask>().Where(pt1 => pt1.PreTaskId == request.PreTaskId).ToList();
+                if (nextPromotionTaskList.Count() > 0)
+                {
+                    CheckSkuRepeat(pt, nextPromotionTaskList);
+                }
             }
 
-
             #region 清空后代
             var waitList = fsql.Select<PromotionTask>().Where(pt1 => pt1.ShopId == pt.ShopId &&
                                                                      pt1.Id != pt.Id &&
diff --git a/BBWY.Server.Model/Dto/Request/PromotionTask/EditPreTaskRequest.cs b/BBWY.Server.Model/Dto/Request/PromotionTask/EditPreTaskRequest.cs
index db40b499..f35a86b3 100644
--- a/BBWY.Server.Model/Dto/Request/PromotionTask/EditPreTaskRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/PromotionTask/EditPreTaskRequest.cs
@@ -8,7 +8,7 @@
         public long TaskId { get; set; }
 
         /// <summary>
-        /// 前置任务Id
+        /// 前置任务Id -1代表下一轮开始
         /// </summary>
         public long PreTaskId { get; set; }
     }