From 9aa44adc2ad53ce17ab7fbce8eb7271e1a124b30 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 5 Feb 2023 04:41:45 +0800
Subject: [PATCH] 1

---
 .../EvaluationAssistantBusiness.cs            | 21 +++++++++++++++++++
 .../Db/EvaluationAssistant/PromotionTask.cs   |  2 +-
 .../PromotionTask/PromotionTaskResponse.cs    |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
index e1028d2d..8573f82b 100644
--- a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
+++ b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
@@ -26,6 +26,7 @@ namespace BBWY.Server.Business
         private DingDingBusiness dingDingBusiness;
         private NLogManager nLogManager;
         private List<Enums.OrderState> validOrderStateList;
+        private List<Enums.PromitionTaskStatus> preTaskStateList;
         private ProductBusiness productBusiness;
 
         public EvaluationAssistantBusiness(RestApiService restApiService, IOptions<GlobalConfig> options, YunDingBusiness yunDingBusiness, IFreeSql fsql, IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, VenderBusiness venderBusiness, DingDingBusiness dingDingBusiness, NLogManager nLogManager, ProductBusiness productBusiness) : base(restApiService, options, yunDingBusiness)
@@ -46,6 +47,11 @@ namespace BBWY.Server.Business
                  Enums.OrderState.已完成,
                  Enums.OrderState.锁定
             };
+            preTaskStateList = new List<Enums.PromitionTaskStatus>()
+            {
+                Enums.PromitionTaskStatus.等待,
+                Enums.PromitionTaskStatus.进行中
+            };
         }
 
         #region 赠品模板
@@ -256,6 +262,21 @@ namespace BBWY.Server.Business
             };
         }
 
+        public PromotionTaskResponse GetPrePromotionTaskList(long shopId)
+        {
+            var list = fsql.Select<PromotionTask>().Where(pt => pt.ShopId == shopId)
+                                                   .Where(pt => preTaskStateList.Contains(pt.Status.Value))
+                                                   .OrderByDescending(pt => pt.Sort)
+                                                   .Page(1, 100)
+                                                   .Count(out long count)
+                                                   .ToList<PromotionTaskItemResponse>();
+            return new PromotionTaskResponse()
+            {
+                Count = count,
+                ItemList = list
+            };
+        }
+
         /// <summary>
         /// 修改任务排序
         /// </summary>
diff --git a/BBWY.Server.Model/Db/EvaluationAssistant/PromotionTask.cs b/BBWY.Server.Model/Db/EvaluationAssistant/PromotionTask.cs
index 845e36a3..dd97ea20 100644
--- a/BBWY.Server.Model/Db/EvaluationAssistant/PromotionTask.cs
+++ b/BBWY.Server.Model/Db/EvaluationAssistant/PromotionTask.cs
@@ -134,7 +134,7 @@ namespace BBWY.Server.Model.Db
         /// <summary>
         /// 前置任务Id
         /// </summary>
-        public long? BeforeTaskId { get; set; }
+        public long? PreTaskId { get; set; }
 
         /// <summary>
         /// 错误信息
diff --git a/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs b/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs
index e881da53..3e470abf 100644
--- a/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs
+++ b/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs
@@ -117,7 +117,7 @@ namespace BBWY.Server.Model.Dto
         /// <summary>
         /// 前置任务Id
         /// </summary>
-        public long? BeforeTaskId { get; set; }
+        public long? PreTaskId { get; set; }
 
         /// <summary>
         /// 错误信息