From 96457adabe36201415fca30c93fe34d1c188d61c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E9=BE=99=20=E7=8E=8B?= Date: Wed, 20 Nov 2024 10:01:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:=20=E8=B0=83=E6=95=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=8F=8D=E5=8F=82?= =?UTF-8?q?=E4=B8=AD=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8D=95=E5=8F=B7=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E8=BF=87=E6=BB=A4=E4=B8=89=E6=96=B9=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=9D=A1=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/SJZY.Track.Repository/Repositories/OrderRepository.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs index 727f17d6..0e046330 100644 --- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs @@ -202,7 +202,7 @@ public class OrderRepository : BasicRepository, IOrderRepository, I /// /// 拼接多个三方单号,默认使用分隔符默认（、） - /// 第三方单号，服务商-轨迹0000000、轨迹服务商-0000000 + /// 第三方单号展示: 0000000(服务商)、0000000(服务商) /// /// /// @@ -210,7 +210,8 @@ public class OrderRepository : BasicRepository, IOrderRepository, I { const string separator = "、"; var thirdPartyOrderNumbers = orderPlatformNumberEntities - .Select(x => $"{x.Platform}-{x.OrderNumber}").ToList(); + .Where(x => !string.IsNullOrWhiteSpace(x.OrderNumber)) + .Select(x => $"{x.OrderNumber}({x.Platform})").ToList(); return string.Join(separator, thirdPartyOrderNumbers); } From 24859d393b34e0d021585f856313be9c7318018f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E9=BE=99=20=E7=8E=8B?= Date: Wed, 20 Nov 2024 11:22:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?upgrade-package:=20=E5=8D=87=E7=BA=A7Rabbit?= =?UTF-8?q?Mq=E4=BE=9D=E8=B5=96=E5=8C=852.0.9=3D>2.1.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit update:调整AddRabbitBoot中的初始化相关配置 --- .../Rabbit/TrackPushCompletedEventHandler.cs | 7 +++++-- .../Rabbit/TrackRefreshEventHandler.cs | 8 +++++--- .../SJZY.Track.Application.csproj | 2 +- .../SjzyTrackApplicationModule.cs | 15 ++++----------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs index 348d7a4b..e55485a9 100644 --- a/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs +++ b/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs @@ -26,9 +26,12 @@ public class TrackPushCompletedEventHandler : ITransientDependency, IRabbitHandl _trackPushRecordEsRepository = trackPushRecordEsRepository; } - public bool Enable(ConsumeOptions options) + public ConsumeOptions Options() { - return options.Queue == GlobalConst.TrackPushCompletedSubscribe; + return new ConsumeOptions() + { + Queue = GlobalConst.TrackPushCompletedSubscribe + }; } public async Task Handle(IServiceProvider sp, BasicDeliverEventArgs args, ConsumeOptions options) diff --git a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs index ff8c6d1d..88cc1ad0 100644 --- a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs +++ b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs @@ -39,10 +39,12 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler _logger = logger; } - - public bool Enable(ConsumeOptions options) + public ConsumeOptions Options() { - return options.Queue == GlobalConst.TrackRefreshSubscribe; + return new ConsumeOptions() + { + Queue = GlobalConst.TrackRefreshSubscribe, + }; } public async Task Handle(IServiceProvider sp, BasicDeliverEventArgs args, ConsumeOptions options) diff --git a/src/SJZY.Track.Application/SJZY.Track.Application.csproj b/src/SJZY.Track.Application/SJZY.Track.Application.csproj index 0bcf26d3..0beb6ea8 100644 --- a/src/SJZY.Track.Application/SJZY.Track.Application.csproj +++ b/src/SJZY.Track.Application/SJZY.Track.Application.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs index e36b86ce..9318e6ca 100644 --- a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs +++ b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs @@ -140,6 +140,10 @@ public class SjzyTrackApplicationModule : AbpModule options.ConnectionString = $"amqp://{configuration["RabbitMQ:UserName"]}:{configuration["RabbitMQ:Password"]}@{configuration["RabbitMQ:HostName"]}:{configuration["RabbitMQ:Port"]}"; options.PoolSize = configuration.GetValue("RabbitMQ:PoolSize"); + options.Declarations = new List>() + { + o=>o.ExchangeDeclare(GlobalConst.TrackChangeExchange, ExchangeType.Topic, true), + }; options.Consumes = new List { new() @@ -154,17 +158,6 @@ public class SjzyTrackApplicationModule : AbpModule o.QueueBind(GlobalConst.TrackRefreshSubscribe, GlobalConst.InterfaceRelayExchange, GlobalConst.TrackRefreshSubscribe); } - }, - new() - { - //广播轨迹 - Queue = GlobalConst.TrackRefreshSubscribe, - FetchCount = configuration.GetValue("TrackApp:TrackRefreshFetchCount"), - FailedRequeue = false, - Declaration = o => - { - o.ExchangeDeclare(GlobalConst.TrackChangeExchange, ExchangeType.Topic, true); - } } }; }, typeof(SjzyTrackApplicationModule).Assembly); From a82258e1cc5221c859667010ae6c0e40a3544f9b Mon Sep 17 00:00:00 2001 From: eli Date: Wed, 20 Nov 2024 17:26:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E8=BD=A8=E8=BF=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=BD=B4=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/TrackOrders/TrackOrderService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index af769700..c57d1abd 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -256,6 +256,7 @@ public class TrackOrderService : ApplicationService }); } + res.Data = res.Data?.OrderBy(m => m.TrackTime).ToList(); return res; }