From 3bfacc1909540ee76bb34c0a3df8a29446cba71e Mon Sep 17 00:00:00 2001
From: xiaolipro <2357729423@qq.com>
Date: Wed, 25 Sep 2024 16:48:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B9=E6=8B=89=E5=8F=96=E6=B6=88=E8=B4=B9=E8=80=85=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProvideServices/GetOrderDetailsInput.cs   |  4 +-
 .../Events/TrackUpsertEvent.cs                |  5 ---
 .../Rabbit/TrackRefreshEventHandler.cs        | 45 ++++++++++---------
 .../Services/ProvideServices/TrackService.cs  |  1 +
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs
index 6ba370ad..265723e8 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs
@@ -43,9 +43,9 @@ public class TrackOrderDetailDto
     public string? EnContent { get; set; }
 
     /// <summary>
-    /// 服务商
+    /// 服务商代码
     /// </summary>
-    public string? ServiceProviderName { get; set; }
+    public string? ServiceProviderCode { get; set; }
 
     /// <summary>
     /// 原轨迹内容
diff --git a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs
index 7de9a33e..1bd4b033 100644
--- a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs
+++ b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs
@@ -7,11 +7,6 @@ public class TrackUpsertEvent
     /// </summary>
     public int SubSystemId { get; set; }
 
-    /// <summary>
-    /// 子系统code
-    /// </summary>
-    public string SubSystemCode { get; set; }
-
     /// <summary>
     /// 客户id
     /// </summary>
diff --git a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs
index 1e8c2cc3..9f47e279 100644
--- a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs
+++ b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs
@@ -163,7 +163,7 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
         // 1、匹配轨迹代码
 
         // 2、匹配轨迹状态
-        if (!paramConfig.TrackStatusName.IsNullOrWhiteSpace())
+        if (matchedContentConfig == null && !paramConfig.TrackStatusName.IsNullOrWhiteSpace())
         {
             var trackStatus = trackToken[paramConfig.TrackStatusName!]?.Value<string>();
             if (!trackStatus.IsNullOrWhiteSpace())
@@ -171,8 +171,9 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
                 matchedContentConfig = contentConfigs.FirstOrDefault(x => x.TrackStatusValue == trackStatus);
             }
         }
+
         // 3、匹配轨迹内容
-        else if (!paramConfig.TrackContentName.IsNullOrWhiteSpace())
+        if (matchedContentConfig == null && !paramConfig.TrackContentName.IsNullOrWhiteSpace())
         {
             if (!trackContent.IsNullOrWhiteSpace())
             {
@@ -180,31 +181,30 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
                 // 3.1 按内容直接匹配
 
                 // 3.2 按关键字分析轨迹内容
-                if (matchedContentConfig is null)
+                foreach (var contentConfig in contentConfigs)
                 {
-                    foreach (var contentConfig in contentConfigs)
+                    foreach (var keyword in contentConfig.TrackKeyword?.Split(',') ?? Enumerable.Empty<string>())
                     {
-                        foreach (var keyword in contentConfig.TrackKeyword?.Split(',') ?? Enumerable.Empty<string>())
+                        if (trackContent.Contains(keyword, StringComparison.OrdinalIgnoreCase))
                         {
-                            if (trackContent.Contains(keyword, StringComparison.OrdinalIgnoreCase))
-                            {
-                                matchedContentConfig = contentConfig;
-                                break;
-                            }
-                        }
-
-                        if (matchedContentConfig is null) continue;
-
-                        foreach (var keyword in contentConfig.TrackKeywordReverse?.Split(',') ??
-                                                Enumerable.Empty<string>())
-                        {
-                            if (trackContent.Contains(keyword, StringComparison.OrdinalIgnoreCase))
-                            {
-                                matchedContentConfig = null;
-                                break;
-                            }
+                            matchedContentConfig = contentConfig;
+                            break;
                         }
                     }
+
+                    if (matchedContentConfig is null) continue;
+
+                    foreach (var keyword in contentConfig.TrackKeywordReverse?.Split(',') ??
+                                            Enumerable.Empty<string>())
+                    {
+                        if (trackContent.Contains(keyword, StringComparison.OrdinalIgnoreCase))
+                        {
+                            matchedContentConfig = null;
+                            break;
+                        }
+                    }
+
+                    if (matchedContentConfig is not null) break; // 找到匹配的，跳出循环
                 }
             }
         }
@@ -251,6 +251,7 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
                 OriginTrackContent = trackContent ?? GlobalConst.EmptyString,
             },
             SubSystemId = context.SubSystemId,
+            CustomId = context.CustomId,
             TrackCode = matchedContentConfig.TrackContentCode,
             TrackPlace = trackPlace ?? GlobalConst.EmptyString,
             TrackTime = trackTime ?? DateTime.Now,
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs
index ae1e9946..63fdd064 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs
@@ -125,6 +125,7 @@ public partial class TrackService : ApplicationService, ITrackService
         return new UnifyResultDto(true, true);
     }
 
+
     /// <summary>
     /// 批量删除轨迹
     /// </summary>