From 196547e80a2fda2be9e097f54b90123005fb911b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E9=BE=99=20=E7=8E=8B?= Date: Tue, 19 Nov 2024 10:32:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update:=E5=A2=9E=E5=8A=A0=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=9B=B8=E5=85=B3=E5=AE=9E=E4=BD=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20-=20TrackPlaceCityId=EF=BC=88=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E5=9C=B0=EF=BC=88=E5=9F=8E=E5=B8=82=EF=BC=89?= =?UTF-8?q?Id=EF=BC=89=20-=20TrackPlaceProvinceId=EF=BC=88=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9=E5=8F=91=E7=94=9F=E5=9C=B0=EF=BC=88=E7=9C=81/?= =?UTF-8?q?=E5=B7=9E=EF=BC=89Id=EF=BC=89=20-=20TrackPlaceNationId=20?= =?UTF-8?q?=EF=BC=88=20=E8=BD=A8=E8=BF=B9=E5=8F=91=E7=94=9F=E5=9C=B0?= =?UTF-8?q?=EF=BC=88=E5=9B=BD=E5=AE=B6/=E5=9C=B0=E5=8C=BA=EF=BC=89Id?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProvideServices/BatchUpsertTrackInput.cs | 15 ++++++++++++ .../Dtos/ProvideServices/UpsertTrackInput.cs | 15 ++++++++++++ .../Events/TrackChangeEto.cs | 15 ++++++++++++ .../Events/TrackUpsertEvent.cs | 15 ++++++++++++ .../EventHandlers/TrackUpsertEventHandler.cs | 9 ++++++++ .../Services/ProvideServices/TrackService.cs | 3 +++ .../TrackDetailsIndex.cs | 23 +++++++++++++++---- src/SJZY.Track.Domain/Consts/GlobalConst.cs | 1 + .../Repositories/TrackDetailsEsRepository.cs | 9 ++++++++ 9 files changed, 101 insertions(+), 4 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs index 337d02a7..3992554f 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs @@ -73,16 +73,31 @@ public class BatchUpsertTrackInput : OrderNosInfo /// public string? TrackPlaceCity { get; set; } + /// + /// 轨迹发生地（城市）Id + /// + public int? TrackPlaceCityId { get; set; } + /// /// 轨迹发生地（省/州） /// public string? TrackPlaceProvince { get; set; } + /// + ///轨迹发生地（省/州）Id + /// + public int? TrackPlaceProvinceId { get; set; } + /// /// 轨迹发生地（国家/地区） /// public string? TrackPlaceNation { get; set; } + /// + /// 轨迹发生地（国家/地区）Id + /// + public int? TrackPlaceNationId { get; set; } + /// /// 轨迹发生地邮编 /// diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs index d38a19e4..309d652e 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs @@ -73,16 +73,31 @@ public class UpsertTrackInput : OrderNoInfo /// public string? TrackPlaceCity { get; set; } + /// + /// 轨迹发生地（城市）Id + /// + public int? TrackPlaceCityId { get; set; } + /// /// 轨迹发生地（省/州） /// public string? TrackPlaceProvince { get; set; } + /// + /// 轨迹发生地（省/州）Id + /// + public int? TrackPlaceProvinceId { get; set; } + /// /// 轨迹发生地（国家/地区） /// public string? TrackPlaceNation { get; set; } + /// + /// 轨迹发生地（国家/地区）Id + /// + public int? TrackPlaceNationId { get; set; } + /// /// 轨迹发生地邮编 /// diff --git a/src/SJZY.Track.Application.Contract/Events/TrackChangeEto.cs b/src/SJZY.Track.Application.Contract/Events/TrackChangeEto.cs index e1559126..f2eb4fe9 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackChangeEto.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackChangeEto.cs @@ -94,16 +94,31 @@ public class TrackChangeEto /// public string? TrackPlaceCity { get; set; } + /// + /// 轨迹发生地（城市）Id + /// + public int? TrackPlaceCityId { get; set; } + /// /// 轨迹发生地（省/州） /// public string? TrackPlaceProvince { get; set; } + /// + ///轨迹发生地（省/州）Id + /// + public int? TrackPlaceProvinceId { get; set; } + /// /// 轨迹发生地（国家/地区） /// public string? TrackPlaceNation { get; set; } + /// + /// 轨迹发生地（国家/地区）Id + /// + public int? TrackPlaceNationId { get; set; } + /// /// 轨迹发生地邮编 /// diff --git a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs index 07fa4f95..e45b3da8 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs @@ -91,16 +91,31 @@ public class TrackUpsertEvent /// public string? TrackPlaceCity { get; set; } + /// + /// 轨迹发生地（城市）Id + /// + public int? TrackPlaceCityId { get; set; } + /// /// 轨迹发生地（省/州） /// public string? TrackPlaceProvince { get; set; } + /// + ///轨迹发生地（省/州）Id + /// + public int? TrackPlaceProvinceId { get; set; } + /// /// 轨迹发生地（国家/地区） /// public string? TrackPlaceNation { get; set; } + /// + /// 轨迹发生地（国家/地区）Id + /// + public int? TrackPlaceNationId { get; set; } + /// /// 轨迹发生地邮编 /// diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs index cfdc1ed4..f8a42fad 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs @@ -72,8 +72,11 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe EstimatedDeliveryDate = eto.EstimatedDeliveryDate, TrackPlacePostcode = eto.TrackPlacePostcode, TrackPlaceNation = eto.TrackPlaceNation, + TrackPlaceNationId = eto.TrackPlaceNationId, TrackPlaceProvince = eto.TrackPlaceProvince, + TrackPlaceProvinceId = eto.TrackPlaceProvinceId, TrackPlaceCity = eto.TrackPlaceCity, + TrackPlaceCityId = eto.TrackPlaceCityId, Files = eto.Files, Remarks = eto.Remarks, Source = eto.Source, @@ -363,8 +366,11 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe FileName = x.FileName }).ToList(), TrackPlaceCity = @event.TrackPlaceCity ?? GlobalConst.EmptyString, + TrackPlaceCityId = @event.TrackPlaceCityId ?? GlobalConst.NotExistId, TrackPlaceProvince = @event.TrackPlaceProvince ?? GlobalConst.EmptyString, + TrackPlaceProvinceId = @event.TrackPlaceProvinceId ?? GlobalConst.NotExistId, TrackPlaceNation = @event.TrackPlaceNation ?? GlobalConst.EmptyString, + TrackPlaceNationId = @event.TrackPlaceNationId ?? GlobalConst.NotExistId, TrackPlacePostcode = @event.TrackPlacePostcode ?? GlobalConst.EmptyString, DestinationTimeZone = @event.DestinationTimeZone, EstimatedDeliveryDate = @event.EstimatedDeliveryDate, @@ -398,8 +404,11 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe FileName = x.FileName }).ToList(); track.TrackPlaceCity = @event.TrackPlaceCity ?? GlobalConst.EmptyString; + track.TrackPlaceCityId = @event.TrackPlaceCityId ?? GlobalConst.NotExistId; track.TrackPlaceProvince = @event.TrackPlaceProvince ?? GlobalConst.EmptyString; + track.TrackPlaceProvinceId = @event.TrackPlaceProvinceId ?? GlobalConst.NotExistId; track.TrackPlaceNation = @event.TrackPlaceNation ?? GlobalConst.EmptyString; + track.TrackPlaceNationId = @event.TrackPlaceNationId ?? GlobalConst.NotExistId; track.TrackPlacePostcode = @event.TrackPlacePostcode ?? GlobalConst.EmptyString; track.DestinationTimeZone = @event.DestinationTimeZone; track.EstimatedDeliveryDate = @event.EstimatedDeliveryDate; diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs index a1eea9ae..bcdbb794 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs @@ -357,8 +357,11 @@ public partial class TrackService : ApplicationService, ITrackService Content = input.Content, EnStatus = input.EnStatus, TrackPlaceCity = input.TrackPlaceCity, + TrackPlaceCityId = input.TrackPlaceCityId, TrackPlaceProvince = input.TrackPlaceProvince, + TrackPlaceProvinceId = input.TrackPlaceProvinceId, TrackPlaceNation = input.TrackPlaceNation, + TrackPlaceNationId = input.TrackPlaceNationId, TrackPlacePostcode = input.TrackPlacePostcode, EstimatedDeliveryDate = input.EstimatedDeliveryDate, DestinationTimeZone = input.DestinationTimeZone diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs index 887ac5f9..c842786b 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs @@ -135,22 +135,37 @@ public class TrackDetailsIndex : IdBaseIndex /// /// 轨迹发生地（城市） /// - public string? TrackPlaceCity { get; set; } + public string? TrackPlaceCity { get; set; } = GlobalConst.EmptyString; + + /// + /// 轨迹发生地（城市）Id + /// + public int? TrackPlaceCityId { get; set; } = GlobalConst.NotExistId; /// /// 轨迹发生地（省/州） /// - public string? TrackPlaceProvince { get; set; } + public string? TrackPlaceProvince { get; set; } = GlobalConst.EmptyString; + + /// + ///轨迹发生地（省/州）Id + /// + public int? TrackPlaceProvinceId { get; set; } = GlobalConst.NotExistId; /// /// 轨迹发生地（国家/地区） /// - public string? TrackPlaceNation { get; set; } + public string? TrackPlaceNation { get; set; } = GlobalConst.EmptyString; + + /// + /// 轨迹发生地（国家/地区）Id + /// + public int? TrackPlaceNationId { get; set; } = GlobalConst.NotExistId; /// /// 轨迹发生地邮编 /// - public string? TrackPlacePostcode { get; set; } + public string? TrackPlacePostcode { get; set; } = GlobalConst.EmptyString; /// /// 预计签收时间 diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.cs b/src/SJZY.Track.Domain/Consts/GlobalConst.cs index 183d921e..d8064f12 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.cs +++ b/src/SJZY.Track.Domain/Consts/GlobalConst.cs @@ -7,6 +7,7 @@ public partial class GlobalConst public const int ChunkSize = 100; public const int SafelyLimit = 10000; public const int NormalLimit = 10000; + public const int NotExistId = -9999; public const float NoneTrackTimeZone = 99999; diff --git a/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs index beb8dc0a..0fee4fc6 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs @@ -152,8 +152,11 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract Date: Tue, 19 Nov 2024 10:47:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=91=BD=E5=90=8D?= =?UTF-8?q?=20GTM=20=3D>=20GMT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/TrackOrders/TrackOrderService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index 009ebc59..ae449cf8 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -98,7 +98,7 @@ public class TrackOrderService : ApplicationService int hours = (int) x.TrackTimeZone; // 提取整数部分作为小时 int minutes = (int) ((x.TrackTimeZone - hours) * 60); // 将小数部分乘以 60 转换为分钟 x.TrackGTMTimeZone = - $"GTM {(x.TrackTimeZone >= 0 ? "+" : "-")}{new TimeSpan(hours, minutes, 0).ToString().RemovePostFix(":00")}"; + $"GMT {(x.TrackTimeZone >= 0 ? "+" : "-")}{new TimeSpan(hours, minutes, 0).ToString().RemovePostFix(":00")}"; }); return res; @@ -149,7 +149,7 @@ public class TrackOrderService : ApplicationService { if (a.TrackTimeZoneValue == 0f) { - a.TrackTimeZone = "GTM +00:00"; + a.TrackTimeZone = "GMT +00:00"; } else if (Math.Abs(a.TrackTimeZoneValue - GlobalConst.NoneTrackTimeZone) < 1) { @@ -163,7 +163,7 @@ public class TrackOrderService : ApplicationService var offset = new TimeSpan(hours, minutes, 0); var timeZoneStr = offset.ToString(); var flag = a.TrackTimeZoneValue > 0f ? "+" : ""; - a.TrackTimeZone = $"GTM {flag}{timeZoneStr.RemovePostFix(":00")}"; + a.TrackTimeZone = $"GMT {flag}{timeZoneStr.RemovePostFix(":00")}"; } }); return list;