From d60a3b7239ed41d5b827692c3a69e4746d0b86ec Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 3 Feb 2023 22:53:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=81=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/EvaluationAssistantController.cs         | 7 ++++---
 .../EvaluationAssistant/EvaluationAssistantBusiness.cs   | 9 +++++----
 BBWY.Test/Program.cs                                     | 2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/BBWY.Server.API/Controllers/EvaluationAssistantController.cs b/BBWY.Server.API/Controllers/EvaluationAssistantController.cs
index 16a39775..da6bfaa8 100644
--- a/BBWY.Server.API/Controllers/EvaluationAssistantController.cs
+++ b/BBWY.Server.API/Controllers/EvaluationAssistantController.cs
@@ -124,17 +124,18 @@ namespace BBWY.Server.API.Controllers
         [HttpGet]
         public void StartMonitor()
         {
-            evaluationAssistantBusiness.StartMonitor(null);
+            evaluationAssistantBusiness.StartMonitor(null, null);
         }
 
         /// <summary>
         /// 开始监控(按店铺)
         /// </summary>
         /// <param name="shopId"></param>
+        /// <param name="taskId"></param>
         [HttpGet]
-        public void StartMonitorByShopId(long shopId)
+        public void StartMonitorByShopId(long shopId, long? taskId)
         {
-            evaluationAssistantBusiness.StartMonitor(shopId);
+            evaluationAssistantBusiness.StartMonitor(shopId, taskId);
         }
     }
 }
diff --git a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
index 03af6482..e1028d2d 100644
--- a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
+++ b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
@@ -554,7 +554,7 @@ namespace BBWY.Server.Business
 
         #region 自动任务
 
-        public void StartMonitor(long? shopId)
+        public void StartMonitor(long? shopId, long? taskId)
         {
             //查询店铺
             var shopList = venderBusiness.GetShopList(shopId, Enums.Platform.京东);
@@ -562,7 +562,8 @@ namespace BBWY.Server.Business
             //查询正在进行的任务
             var runningTaskList = fsql.Select<PromotionTask>()
                                       .WhereIf(shopId != null, pt => pt.ShopId == shopId)
-                                      .Where(pt => pt.Status == Enums.PromitionTaskStatus.进行中).ToList();
+                                      .WhereIf(taskId != null, pt => pt.Id == taskId)
+                                      .WhereIf(taskId == null, pt => pt.Status == Enums.PromitionTaskStatus.进行中).ToList();
 
             if (runningTaskList == null || runningTaskList.Count() == 0)
                 return;
@@ -695,7 +696,7 @@ namespace BBWY.Server.Business
                 }
 
                 promotionTask.CompletedTaskCount += completedTaskCount;
-                var isDone = promotionTask.CompletedTaskCount >= promotionTask.TaskCount || (promotionTask.EndTime != null && promotionTask.EndTime < DateTime.Now);
+                var isDone = promotionTask.CompletedTaskCount >= promotionTask.TaskCount || (promotionTask.EndTime != null && DateTime.Now > promotionTask.EndTime);
 
                 if (completedTaskCount > 0 || isDone)
                 {
@@ -707,7 +708,7 @@ namespace BBWY.Server.Business
 
                     if (isDone)
                     {
-                        if (promotionTask.EndTime < DateTime.Now)
+                        if (DateTime.Now < promotionTask.EndTime)
                         {
                             #region 提前完成任务量，暂停JD活动
                             {
diff --git a/BBWY.Test/Program.cs b/BBWY.Test/Program.cs
index 78c9c801..bf123e9e 100644
--- a/BBWY.Test/Program.cs
+++ b/BBWY.Test/Program.cs
@@ -43,7 +43,7 @@ namespace BBWY.Test
 
             IJdClient client = GetJdClient(appkey, appSecret);
             var p = new JDPromotionAPITest();
-            p.GetPromotionDetailById(client, token, 5625514004);
+            p.GetPromotionDetailById(client, token, 5626923858);
 
 
             //{