From c053a83a27470b30ef1d4bb73712c29d31c0c3bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com>
Date: Mon, 25 Mar 2024 17:39:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=8F=AA=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E7=9A=84=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProvideServices/TrackPushService.cs        | 17 ++++++++++++-----
 .../OrderAggregate/IOrderRepository.cs         |  5 +++++
 .../Queries/TrackOrderQueries.cs               |  2 ++
 .../Repositories/OrderRepository.cs            | 18 ++++++++++++++++++
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
index b0972b56..85e48c02 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
@@ -75,6 +75,8 @@ public class TrackPushService : ApplicationService
                 await _pushCacheService.GetPushContentConfigAsync(order.SubSystemId, order.CustomId,
                     track.TrackContentId);
 
+            if (config == null) continue;
+
             var trackPushEvent = new TrackPushEvent
             {
                 ServiceProviderCode = config.ServiceProviderCode,
@@ -113,14 +115,19 @@ public class TrackPushService : ApplicationService
     [HttpPost("Track/PushWarnForTask")]
     public async Task<string> PushWarnForTaskAsync()
     {
-        var time = DateTime.Now.Subtract(TimeSpan.FromHours(12));
-        var orders = await _orderRepository.GetListAsync(x =>
-            !x.IsCompleted && x.QuestionType == 0 && x.LatestPushTime < time);
+        var orders = await _orderRepository.GetPushWarnOrdersAsync();
 
-        orders.ForEach(x => { x.QuestionType = (int)TrackProblemType.Warn; });
+        var time = DateTime.Now.Subtract(TimeSpan.FromHours(12));
+
+        orders.ForEach(x =>
+        {
+            x.QuestionType = x.LatestPushTime == null || x.LatestPushTime < time
+                ? (int)TrackProblemType.Warn
+                : (int)TrackProblemType.None;
+        });
 
         await _orderRepository.UpdateRangeAsync(orders, x => new { x.QuestionType });
 
-        return $"成功将{orders.Select(x => x.OrderNo).JoinAsString(",")}置为预警单";
+        return $"成功将：{orders.Count(x => x.QuestionType == (int)TrackProblemType.Warn)}个订单置为预警";
     }
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
index acc0d4de..10832b40 100644
--- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
+++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
@@ -25,6 +25,11 @@ public interface IOrderRepository : IBasicRepository<OrderEntity>
     /// <returns></returns>
     Task DeleteOrderAsync(int orderId);
 
+    /// <summary>
+    /// 获取推送预警单
+    /// </summary>
+    /// <returns></returns>
+    Task<List<OrderEntity>> GetPushWarnOrdersAsync();
 
     #region 订单关联
 
diff --git a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs
index 8d9d2504..841a3555 100644
--- a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs
+++ b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs
@@ -1,6 +1,7 @@
 using SJZY.Track.Domain.Aggregates.OrderAggregate;
 using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
 using SJZY.Track.Domain.Dtos.Order;
+using SJZY.Track.Domain.Enums;
 using SJZY.Track.Domain.Queries;
 using SJZY.Track.Domain.VEntities;
 using SJZY.Track.Repository.VData.Entitys;
@@ -38,6 +39,7 @@ public class TrackOrderQueries : ISugarRepository, ITrackOrderQueries,
             .WhereIF(input.CustomerId > 0, (a, b, c) => a.CustomId == input.CustomerId)
             .WhereIF(input.TrackOrderType > 0, (a, b, c) => a.OrderType == input.TrackOrderType)
             .WhereIF(input.TabType > 0, (a, b, c) => a.QuestionType == input.TabType)
+            .WhereIF(input.TabType == (int)TrackProblemType.Warn, (a, b, c) => !a.IsCompleted)
             .OrderByDescending((a, b, c) => a.CreateTime)
             .Select((a, b, c) => new TrackOrderVO
             {
diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
index 26a8ed2b..3d18de17 100644
--- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
@@ -1,6 +1,8 @@
 using SJZY.Track.Domain;
 using SJZY.Track.Domain.Aggregates.OrderAggregate;
+using SJZY.Track.Domain.Aggregates.TrackPushAggregate;
 using SJZY.Track.Domain.Dtos.Order;
+using SJZY.Track.Domain.Enums;
 
 namespace SJZY.Track.Repository.Repositories;
 
@@ -53,6 +55,22 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
         tran.Complete();
     }
 
+    public async Task<List<OrderEntity>> GetPushWarnOrdersAsync()
+    {
+        var errorType = (int)TrackProblemType.Error;
+
+        return await Context.Queryable<TrackPushConfigEntity>()
+            .LeftJoin<OrderEntity>((a, b) => a.SubSystemId == b.SubSystemId && a.CustomId == b.CustomId)
+            .Where((a, b) => !b.IsCompleted && b.QuestionType != errorType)
+            .Select((a, b) => new OrderEntity
+            {
+                Id = b.Id,
+                QuestionType = b.QuestionType,
+                LatestPushTime = b.LatestPushTime
+            })
+            .ToListAsync();
+    }
+
     #region 订单关联
 
     public async Task<List<LinkedOrderVO>> GetLinkedOrdersAsync(int orderId)