diff --git a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs index 2903eb5e..5e0e0b82 100644 --- a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs +++ b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs @@ -123,11 +123,11 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler var context = new TrackRefreshContext { OrderId = order.MainOrderId, - OrderType = attach.OrderType, - OrderNo = orderNo!, - ServiceProviderCode = attach.ServiceProviderCode, + OrderNo = order.OrderNo, CustomId = order.CustomId, - SubSystemId = attach.SubSystemId + OrderType = attach.OrderType, + SubSystemId = attach.SubSystemId, + ServiceProviderCode = attach.ServiceProviderCode }; diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs index 718124c6..75ce70f3 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs @@ -24,8 +24,8 @@ public interface IOrderRepository : IBasicRepository /// /// 三方平台 /// 三方平台单号 - /// (主单号id,客户id) - Task<(int MainOrderId, int CustomId)> GetTrackOrderByProviderAndOrderNo(string serviceProviderCode, string orderNo); + /// (主单id,主单号,客户id) + Task<(int MainOrderId, string OrderNo, int CustomId)> GetTrackOrderByProviderAndOrderNo(string serviceProviderCode, string orderNo); /// /// 创建订单 diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs index ace340fa..c4933fcd 100644 --- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs @@ -236,7 +236,7 @@ public class OrderRepository : BasicRepository, IOrderRepository, I return pageList; } - public async Task<(int MainOrderId, int CustomId)> GetTrackOrderByProviderAndOrderNo(string serviceProviderCode, string orderNo) + public async Task<(int MainOrderId, string OrderNo, int CustomId)> GetTrackOrderByProviderAndOrderNo(string serviceProviderCode, string orderNo) { var orderList = await Context.Queryable() .LeftJoin((a, b) => a.Id == b.OrderId && b.IsDeleted == false) @@ -246,6 +246,7 @@ public class OrderRepository : BasicRepository, IOrderRepository, I { a.Id, a.CustomId, + a.OrderNo, b.Platform, b.OrderNumber }) @@ -260,8 +261,8 @@ public class OrderRepository : BasicRepository, IOrderRepository, I //当出现了多条记录匹配,优先使用外部单匹配提升精确度 var matchOrder = orderList.FirstOrDefault(x => x.Platform == serviceProviderCode && x.OrderNumber == orderNo); return matchOrder != null - ? (matchOrder.Id, matchOrder.CustomId) - : (order.Id, order.CustomId); + ? (matchOrder.Id, matchOrder.OrderNo, matchOrder.CustomId) + : (order.Id, order.OrderNo, order.CustomId); } public async Task CreateOrderAsync(OrderEntity order)