From fb26f5b0d1c0904b9b8834853ef5bb3d6b093e53 Mon Sep 17 00:00:00 2001
From: xiaolipro <2357729423@qq.com>
Date: Wed, 18 Sep 2024 17:35:55 +0800
Subject: [PATCH] =?UTF-8?q?fix=E5=AD=90=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SJZY.Track.Application/SJZY.Track.Application.csproj  | 2 +-
 .../Services/ProvideServices/OrderService.Link.cs         | 3 ++-
 .../Services/ProvideServices/TrackPushService.cs          | 8 ++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/SJZY.Track.Application/SJZY.Track.Application.csproj b/src/SJZY.Track.Application/SJZY.Track.Application.csproj
index 35e87215..67055e65 100644
--- a/src/SJZY.Track.Application/SJZY.Track.Application.csproj
+++ b/src/SJZY.Track.Application/SJZY.Track.Application.csproj
@@ -9,6 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="BSI.Stack.Rabbit" Version="2.0.9" />
+        <PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="8.2.1"/>
         <PackageReference Include="SJZY.InterfaceRelay.Application.Contracts" Version="7.2.3"/>
         <PackageReference Include="Volo.Abp.Http.Client" Version="7.0.2" />
         <PackageReference Include="Volo.Abp.FluentValidation" Version="7.0.2" />
@@ -19,7 +20,6 @@
         <PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="8.2.0"/>
         <PackageReference Include="DotNetCore.CAP.MySql" Version="8.2.0"/>
         <PackageReference Include="DotNetCore.CAP.InMemoryStorage" Version="8.2.0"/>
-        <PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0"/>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs
index 52a2885f..a8614eca 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs
@@ -69,7 +69,8 @@ public partial class OrderService
 
         // 查询存在的订单
         var existedOrders = await _orderRepository.GetListAsync(x =>
-                x.OrderType == input.LinkOrderType && noLinkOrderNos.Contains(x.OrderNo),
+                x.SubSystemId == input.SubSystemId && x.OrderType == input.LinkOrderType &&
+                noLinkOrderNos.Contains(x.OrderNo),
             x => new
             {
                 x.Id,
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
index bf4f95ff..5ce6f798 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
@@ -90,6 +90,14 @@ public class TrackPushService : ApplicationService, ITrackPushService
         return $"即将推送轨迹代码{input.TrackCode}给{orders.Length}个订单";
     }
 
+
+    /// <summary>
+    /// 获取轨迹推送内容
+    /// </summary>
+    /// <param name="subSystemId"></param>
+    /// <param name="customerId"></param>
+    /// <returns></returns>
+    [HttpPost("Track/GetTrackPushContentList")]
     public async Task<List<TrackPushContentDto>> GetTrackPushContentListAsync(int subSystemId, int customerId)
     {
         var list = await _trackPushConfigRepository.GetTrackPushContentListAsync(subSystemId, customerId);