diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullConfigDto.cs index f6020d9f..10f78964 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullConfigDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullConfigDto.cs @@ -1,8 +1,19 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; +namespace SJZY.Track.Application.Contract.Dtos.TrackPull; public class TrackPullConfigDto { - public TrackPullParamConfigDto ParamConfig { get; set; } + /// + /// 服务商拉取频率（分钟） + /// + public int PullInterval { get; set; } - public List ContentConfigs { get; set; } + /// + /// 服务商id + /// + public int ServiceProviderId { get; set; } + + /// + /// 子系统id + /// + public int SubSystemId { get; set; } } \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs new file mode 100644 index 00000000..ba38457f --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamWithContentConfigDto.cs @@ -0,0 +1,8 @@ +namespace SJZY.Track.Application.Contract.Dtos.TrackPull; + +public class TrackPullParamWithContentConfigDto +{ + public TrackPullParamConfigDto ParamConfig { get; set; } + + public List ContentConfigs { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs b/src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs index 7eb93992..486d4157 100644 --- a/src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs +++ b/src/SJZY.Track.Application.Contract/Services/ITrackPullCacheService.cs @@ -4,13 +4,22 @@ namespace SJZY.Track.Application.Contract.Services; public interface ITrackPullCacheService { + string TrackPullKey(int subSystemId, int serviceProviderId); + string TrackPullContentKey(int subSystemId, int serviceProviderId); + + /// + /// 获取所有拉取配置 + /// + /// + Task> GetAllPullConfigsAsync(); + /// /// 获取服务商拉取配置 /// /// 子系统id /// 服务商id /// - Task GetPullConfigAsync(int subSystemId, int serviceProviderId); + Task GetPullParamWithContentConfigAsync(int subSystemId, int serviceProviderId); /// /// 设置拉取配置缓存 @@ -19,5 +28,6 @@ public interface ITrackPullCacheService /// 子系统id /// 服务商id /// - Task SetPullConfigAsync(int? id = null, int? subSystemId = null, int? serviceProviderId = null); + Task SetPullConfigAsync(int? id = null, int? subSystemId = null, + int? serviceProviderId = null); } \ No newline at end of file diff --git a/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs index f708877e..b3864e55 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs @@ -34,7 +34,9 @@ public class TrackRefreshEventHandler : ITransientDependency, ICapSubscribe // tips：attach返回的是服务商id，必有 var attach = JsonConvert.DeserializeObject(@event.Attach); if (attach is null) return; - var config = await _trackPullCacheService.GetPullConfigAsync(attach.SubSystemId, attach.ServiceProviderId); + var config = + await _trackPullCacheService.GetPullParamWithContentConfigAsync(attach.SubSystemId, + attach.ServiceProviderId); var data = JObject.Parse(@event.Data.ToString()!); var orderToken = data[config.ParamConfig.OrderPath]; @@ -51,9 +53,10 @@ public class TrackRefreshEventHandler : ITransientDependency, ICapSubscribe } } - private async Task HandleOrderAsync(JToken orderToken, TrackPullConfigDto config, int orderType) + private async Task HandleOrderAsync(JToken orderToken, TrackPullParamWithContentConfigDto paramWithContentConfig, + int orderType) { - var paramConfig = config.ParamConfig; + var paramConfig = paramWithContentConfig.ParamConfig; var orderNo = orderToken[paramConfig.OrderNoName]?.Value(); if (orderNo.IsNullOrWhiteSpace()) return; @@ -80,21 +83,21 @@ public class TrackRefreshEventHandler : ITransientDependency, ICapSubscribe { foreach (var item in trackTokens) { - await HandleTrackAsync(item, config, trackUpsertEvent); + await HandleTrackAsync(item, paramWithContentConfig, trackUpsertEvent); } } else if (orderToken is JObject) { - await HandleTrackAsync(orderToken, config, trackUpsertEvent); + await HandleTrackAsync(orderToken, paramWithContentConfig, trackUpsertEvent); } } - private async Task HandleTrackAsync(JToken trackToken, TrackPullConfigDto config, + private async Task HandleTrackAsync(JToken trackToken, TrackPullParamWithContentConfigDto paramWithContentConfig, TrackUpsertEvent @event) { var trackUpsertEvent = @event.DeepCopy(); - var paramConfig = config.ParamConfig; - var contentConfigs = config.ContentConfigs; + var paramConfig = paramWithContentConfig.ParamConfig; + var contentConfigs = paramWithContentConfig.ContentConfigs; TrackPullContentConfigDto? matchedContentConfig = null; // 1、匹配轨迹代码 diff --git a/src/SJZY.Track.Application/EventHandlers/UpdateOrderTrackEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/UpdateOrderTrackEventHandler.cs index 72316cef..414a4afd 100644 --- a/src/SJZY.Track.Application/EventHandlers/UpdateOrderTrackEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/UpdateOrderTrackEventHandler.cs @@ -25,7 +25,9 @@ public class UpdateOrderTrackEventHandler : ITransientDependency, ICapSubscribe if (@event.TrackTime == default) { if (order.LatestTrackTime == null) return; + // 删除全部轨迹导致的重置行为 + // tips：订单是支持从已完成态到未完成态的 order.ResetTrackInfo(); } else if (order.LatestTrackTime != null && diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushPullService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushPullService.cs index 1401b5b8..faa64a0f 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushPullService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushPullService.cs @@ -1,7 +1,9 @@ using Newtonsoft.Json; +using SJZY.Expand.ABP.Core; using SJZY.InterfaceRelay.Application.Contracts; using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Dtos.TrackPull; +using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.OrderAggregate; using Volo.Abp.Http.Client.DynamicProxying; @@ -16,22 +18,26 @@ public class TrackPushPullService : ApplicationService { private readonly IOrderRepository _orderRepository; private readonly IHttpClientProxy _httpClientProxy; + private readonly ITrackPullCacheService _trackPullCacheService; public TrackPushPullService(IOrderRepository orderRepository, - IHttpClientProxy httpClientProxy) + IHttpClientProxy httpClientProxy, + ITrackPullCacheService trackPullCacheService) { _orderRepository = orderRepository; _httpClientProxy = httpClientProxy; + _trackPullCacheService = trackPullCacheService; } /// - /// 刷新轨迹 + /// 手动刷新轨迹 /// /// /// [HttpPost("Track/Refresh")] public async Task RefreshTrackAsync(RefreshTrackInput input) { + // todo：罚时？ if (input.OrderNos.Count == 0) { throw new BusinessException(message: "订单号数组不能为空"); @@ -39,7 +45,8 @@ public class TrackPushPullService : ApplicationService input.OrderNos = input.OrderNos.Distinct().ToList(); - var orderTemplates = await _orderRepository.GetOrderTemplatesAsync(input.OrderNos); + // 这里没有区分订单类型，就算的不同类型的单一起刷新了也无所谓 + var orderTemplates = await _orderRepository.FindServiceProviderByOrderAsync(input.OrderNos); foreach (var group in orderTemplates.GroupBy(x => new TrackRefreshAttach(x.ServiceProviderId, x.ServiceProviderCode, x.SubSystemId, x.OrderType))) @@ -50,11 +57,51 @@ public class TrackPushPullService : ApplicationService }).ToList(); // 批量获取轨迹 - var requestId = await _httpClientProxy.Service.BatchForwardThenPushToQueueAsync( + await _httpClientProxy.Service.BatchForwardThenPushToQueueAsync( "A012", group.Key.ServiceProviderCode, data, GlobalConst.TrackRefreshSubscribe, JsonConvert.SerializeObject(group.Key)); } + return true; + } + + /// + /// 定时任务刷新轨迹 + /// + /// + [HttpPost("Track/RefreshForTask")] + public async Task RefreshTrackAsync() + { + var configs = await _trackPullCacheService.GetAllPullConfigsAsync(); + foreach (var config in configs) + { + var redisKey = _trackPullCacheService.TrackPullKey(config.SubSystemId, config.ServiceProviderId); + if (await RedisHelper.Client.ExistsAsync(redisKey)) + { + continue; + } + + var orders = await _orderRepository.FindOrderByServiceProviderAsync(config.ServiceProviderId); + + foreach (var group in orders.GroupBy(x => + new TrackRefreshAttach(x.ServiceProviderId, x.ServiceProviderCode, x.SubSystemId, + x.OrderType))) + { + var data = group.Select(x => new + { + x.OrderNo + }).ToList(); + + // 批量获取轨迹 + await _httpClientProxy.Service.BatchForwardThenPushToQueueAsync( + "A012", group.Key.ServiceProviderCode, data, + GlobalConst.TrackRefreshSubscribe, JsonConvert.SerializeObject(group.Key)); + } + + await RedisHelper.Client.SetExAsync(redisKey, config.PullInterval * 60, 1); + } + + return true; } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index 908d7227..06800fc0 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -1,115 +1,118 @@ using SJZY.Track.Application.Contract.Dtos.ProvideServices; -using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.TrackContentAggregate; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; using SJZY.Track.Domain.Dtos.Order; using SJZY.Track.Domain.Dtos.TrackTemplate; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; +using SJZY.Track.Domain.Queries; -namespace SJZY.Track.Application.Services.TrackOrders +namespace SJZY.Track.Application.Services.TrackOrders; + +[ApiExplorerSettings(GroupName = "轨迹订单")] +[Route("/Track/Order")] +public class TrackOrderService : ApplicationService { - [ApiExplorerSettings(GroupName = "轨迹订单")] - [Route("/Track/Order")] - public class TrackOrderService : ApplicationService, ITransientDependency + private readonly ITrackOrderQueries _trackOrderQueries; + private readonly ITrackDetailsRepository _trackDetailsRepository; + private readonly ITrackContentRepository _trackContentRepository; + + public TrackOrderService( + ITrackOrderQueries trackOrderQueries, + ITrackDetailsRepository trackDetailsRepository, + ITrackContentRepository trackContentRepository + ) { - private readonly IOrderRepository _orderRepository; - private readonly ITrackDetailsRepository _trackDetailsRepository; - private readonly ITrackContentRepository _trackContentRepository; - - public TrackOrderService( - IOrderRepository orderRepository, - ITrackDetailsRepository trackDetailsRepository, - ITrackContentRepository trackContentRepository - ) - { - this._orderRepository=orderRepository; - this._trackDetailsRepository=trackDetailsRepository; - this._trackContentRepository=trackContentRepository; - } - - #region 轨迹订单明细 - /// - /// 根据轨迹订单id获取轨迹订单明细列表 - /// - /// - /// - [HttpPost("GetDetails")] - public async Task> GetOrderDetails(GetOrderDetailsInput input) - { - var trackDetails = await _trackDetailsRepository.GetListAsync(input.OrderId); - if (!trackDetails.IsNullOrEmpty()) - { - var list = ObjectMapper.Map, List>(trackDetails); - var trackCodes = list.Where(a => !a.Code.IsNullOrWhiteSpace()).Select(a => a.Code).Distinct().ToList(); - - var trackContents = await _trackContentRepository.GetTrackContentAttributeValue(new GetTemplateContentAttributeValueInputVO - { - SubSystemId =input.SubSystemId, - TrackTemplateIds = input.TrackTemplateIds, - TrackCodes=trackCodes - }); - input.TrackTemplateIds =input.TrackTemplateIds.Where(a => a>0).ToList(); - int id = 1; - list.ForEach(a => - { - a.Id = id++; - - var trackContentsOfTemplates = trackContents.Where(b => b.SubSystemId==input.SubSystemId && b.TrackCode==a.Code - && input.TrackTemplateIds.Contains(b.TrackTemplateId)); - GetTemplateContentAttributeValueVO trackContent = null; - var insertData = input.TrackTemplateIds.Intersect(trackContentsOfTemplates.Select(aa => aa.TrackTemplateId)).ToList(); - if (!insertData.IsNullOrEmpty()) - { - trackContent =trackContentsOfTemplates.FirstOrDefault(a => a.TrackTemplateId==insertData.FirstOrDefault()); - } - - if (trackContent!=null) - { - a.IsCanDelete=trackContent.IsCanDelete; - a.IsExternal = trackContent.IsExternal; - } - if (a.TrackTimeZoneValue==0f) - { - a.TrackTimeZone=$"GTM{" "}+00:00"; - } - else - { - // 将小数形式的小时转换为时区偏移量 - int hours = (int)a.TrackTimeZoneValue; // 提取整数部分作为小时 - int minutes = (int)((a.TrackTimeZoneValue - hours) * 60); // 将小数部分乘以 60 转换为分钟 - TimeSpan offset = new TimeSpan(hours, minutes, 0); - string timeZoneStr = offset.ToString(); - string flag = a.TrackTimeZoneValue>0f ? "+" : ""; - a.TrackTimeZone = $"GTM{" "}{flag}{timeZoneStr.RemovePostFix(":00")}"; - } - }); - return list; - } - - return new List(); - } - #endregion - - #region 轨迹订单列表 - /// - /// 获取分页的轨迹订单 - /// - /// - /// - [HttpPost("GetTrackOrderList")] - public async Task> GetPageTrackOrder(GetPageTrackOrderInput input) - { - var vo = ObjectMapper.Map(input); - var pageList = await _orderRepository.GetPageTrackOrder(vo); - var pageResultDto = - ObjectMapper.Map, UnifyPageResultDto>(pageList); - return pageResultDto; - } - #endregion + _trackOrderQueries = trackOrderQueries; + _trackDetailsRepository = trackDetailsRepository; + _trackContentRepository = trackContentRepository; } -} + + #region 轨迹订单明细 + + /// + /// 根据轨迹订单id获取轨迹订单明细列表 + /// + /// + /// + [HttpPost("GetDetails")] + public async Task> GetOrderDetails(GetOrderDetailsInput input) + { + var trackDetails = await _trackDetailsRepository.GetListAsync(input.OrderId); + if (!trackDetails.IsNullOrEmpty()) + { + var list = ObjectMapper.Map, List>(trackDetails); + var trackCodes = list.Where(a => !a.Code.IsNullOrWhiteSpace()).Select(a => a.Code).Distinct().ToList(); + + var trackContents = await _trackContentRepository.GetTrackContentAttributeValue( + new GetTemplateContentAttributeValueInputVO + { + SubSystemId = input.SubSystemId, + TrackTemplateIds = input.TrackTemplateIds, + TrackCodes = trackCodes + }); + input.TrackTemplateIds = input.TrackTemplateIds.Where(a => a > 0).ToList(); + int id = 1; + list.ForEach(a => + { + a.Id = id++; + + var trackContentsOfTemplates = trackContents.Where(b => b.SubSystemId == input.SubSystemId && + b.TrackCode == a.Code + && input.TrackTemplateIds.Contains( + b.TrackTemplateId)); + GetTemplateContentAttributeValueVO trackContent = null; + var insertData = input.TrackTemplateIds + .Intersect(trackContentsOfTemplates.Select(aa => aa.TrackTemplateId)).ToList(); + if (!insertData.IsNullOrEmpty()) + { + trackContent = + trackContentsOfTemplates.FirstOrDefault(a => a.TrackTemplateId == insertData.FirstOrDefault()); + } + + if (trackContent != null) + { + a.IsCanDelete = trackContent.IsCanDelete; + a.IsExternal = trackContent.IsExternal; + } + + if (a.TrackTimeZoneValue == 0f) + { + a.TrackTimeZone = $"GTM{" "}+00:00"; + } + else + { + // 将小数形式的小时转换为时区偏移量 + int hours = (int)a.TrackTimeZoneValue; // 提取整数部分作为小时 + int minutes = (int)((a.TrackTimeZoneValue - hours) * 60); // 将小数部分乘以 60 转换为分钟 + TimeSpan offset = new TimeSpan(hours, minutes, 0); + string timeZoneStr = offset.ToString(); + string flag = a.TrackTimeZoneValue > 0f ? "+" : ""; + a.TrackTimeZone = $"GTM{" "}{flag}{timeZoneStr.RemovePostFix(":00")}"; + } + }); + return list; + } + + return new List(); + } + + #endregion + + #region 轨迹订单列表 + + /// + /// 获取分页的轨迹订单 + /// + /// + /// + [HttpPost("GetTrackOrderList")] + public async Task> GetPageTrackOrder(GetPageTrackOrderInput input) + { + var vo = ObjectMapper.Map(input); + var pageList = await _trackOrderQueries.GetPageTrackOrder(vo); + var pageResultDto = + ObjectMapper.Map, UnifyPageResultDto>(pageList); + return pageResultDto; + } + + #endregion +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs b/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs index f54f366a..55351d80 100644 --- a/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs +++ b/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs @@ -1,28 +1,39 @@ -using SJZY.Expand.ABP.Core; +using System.Linq.Expressions; +using SJZY.Expand.ABP.Core; using SJZY.Track.Application.Contract.Dtos.TrackPull; using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.TrackPullAggregate; using SJZY.Track.Domain.Dtos.TrackPull; -using System.Linq.Expressions; -using Volo.Abp.DependencyInjection; namespace SJZY.Track.Application.Services.TrackPull; -public class TrackPullCacheService : ApplicationService, ITrackPullCacheService, ITransientDependency +public class TrackPullCacheService : ApplicationService, ITrackPullCacheService { private readonly ITrackPullConfigRepository _trackPullConfigRepository; - private string RedisKey(int subSystemId, int serviceProviderId) => GlobalConst.TrackPushKeyPrefix + subSystemId + ":" + serviceProviderId; + public string TrackPullKey(int subSystemId, int serviceProviderId) => + $"{GlobalConst.TrackPullKeyPrefix}:{subSystemId}:{serviceProviderId}"; + + public string TrackPullContentKey(int subSystemId, int serviceProviderId) => + $"{GlobalConst.TrackPullContentKeyPrefix}:{subSystemId}:{serviceProviderId}"; public TrackPullCacheService(ITrackPullConfigRepository trackPullConfigRepository) { _trackPullConfigRepository = trackPullConfigRepository; } - [NonAction] - public async Task GetPullConfigAsync(int subSystemId, int serviceProviderId) + public Task> GetAllPullConfigsAsync() { - var data = await RedisHelper.Client.GetAsync(RedisKey(subSystemId, serviceProviderId)); + throw new NotImplementedException(); + } + + [NonAction] + public async Task GetPullParamWithContentConfigAsync(int subSystemId, + int serviceProviderId) + { + var data = await RedisHelper.Client.GetAsync(TrackPullContentKey( + subSystemId, + serviceProviderId)); data ??= await SetPullConfigAsync(subSystemId: subSystemId, serviceProviderId: serviceProviderId); @@ -30,9 +41,10 @@ public class TrackPullCacheService : ApplicationService, ITrackPullCacheService, } [NonAction] - public async Task SetPullConfigAsync(int? id = null, int? subSystemId = null, int? serviceProviderId = null) + public async Task SetPullConfigAsync(int? id = null, int? subSystemId = null, + int? serviceProviderId = null) { - var data = new TrackPullConfigDto(); + var data = new TrackPullParamWithContentConfigDto(); Expression> exp = x => true; if (id.HasValue) exp = x => x.Id == id; @@ -47,10 +59,15 @@ public class TrackPullCacheService : ApplicationService, ITrackPullCacheService, var trackPullContentList = await _trackPullConfigRepository.GetContentListCacheAsync(trackPullConfigEntity.Id); if (trackPullContentList.Count == 0) return data; - data.ParamConfig = ObjectMapper.Map(trackPullConfigDetail); - data.ContentConfigs = ObjectMapper.Map, List>(trackPullContentList); + data.ParamConfig = + ObjectMapper.Map(trackPullConfigDetail); + data.ContentConfigs = + ObjectMapper.Map, List>( + trackPullContentList); - await RedisHelper.Client.SetAsync(RedisKey(trackPullConfigEntity.SubSystemId, trackPullConfigEntity.ServiceProviderId), data, 86400); + await RedisHelper.Client.SetAsync( + TrackPullContentKey(trackPullConfigEntity.SubSystemId, trackPullConfigEntity.ServiceProviderId), data, + 86400); return data; } diff --git a/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs b/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs index 62df4046..046ea943 100644 --- a/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs +++ b/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs @@ -10,7 +10,7 @@ public class TrackPushCacheService : ITrackPushCacheService, ITransientDependenc { private readonly IBasicQuery _trackPushConfigQuery; - private string RedisKey(int customId) => GlobalConst.TrackPushKeyPrefix + customId; + private string RedisKey(int customId) => $"{GlobalConst.TrackPushKeyPrefix}:{customId}"; public TrackPushCacheService(IBasicQuery trackPushConfigQuery) { diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs index 9e8d59eb..2f99ba3f 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs @@ -11,13 +11,6 @@ public interface IOrderRepository : IBasicRepository /// Task CreateOrderAsync(OrderEntity order); - /// - /// 获取分页的轨迹订单 - /// - /// - /// - Task> GetPageTrackOrder(GetPageTrackOrderInputVO input); - /// /// 更新订单 /// @@ -60,9 +53,16 @@ public interface IOrderRepository : IBasicRepository /// - /// 获取订单模板列表 + /// 根据订单模板找对应服务商 /// /// /// - Task> GetOrderTemplatesAsync(List orderNos); + Task> FindServiceProviderByOrderAsync(List orderNos); + + /// + /// 获取服务商下所有单（未完成的） + /// + /// + /// + Task> FindOrderByServiceProviderAsync(int serviceProvider); } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateVO.cs b/src/SJZY.Track.Domain/Dtos/Order/OrderServiceProviderVO.cs similarity index 87% rename from src/SJZY.Track.Domain/Dtos/Order/OrderTemplateVO.cs rename to src/SJZY.Track.Domain/Dtos/Order/OrderServiceProviderVO.cs index 6fe7d2b5..36a46aa8 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/OrderTemplateVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/OrderServiceProviderVO.cs @@ -1,6 +1,6 @@ namespace SJZY.Track.Domain.Dtos.Order; -public class OrderTemplateVO +public class OrderServiceProviderVO { public string OrderNo { get; set; } = null!; @@ -9,8 +9,6 @@ public class OrderTemplateVO /// public int OrderType { get; set; } - public int TemplateId { get; set; } - public int ServiceProviderId { get; set; } /// diff --git a/src/SJZY.Track.Domain/GlobalConst.cs b/src/SJZY.Track.Domain/GlobalConst.cs index 629149a8..981ce249 100644 --- a/src/SJZY.Track.Domain/GlobalConst.cs +++ b/src/SJZY.Track.Domain/GlobalConst.cs @@ -27,11 +27,6 @@ public class GlobalConst /// public const string UpdateOrderTrackSubscribe = "SJZY.Track.UpdateOrderTrack"; - /// - /// 轨迹删除后触发更新订单轨迹 mq订阅名称 - /// - public const string DeleteTrackAfterUpdateOrderSubscribe = "SJZY.Track.DeleteTrackAfterUpdateOrder"; - /// /// 关联订单后补轨迹 mq订阅名称 /// @@ -40,10 +35,15 @@ public class GlobalConst /// /// 轨迹要推送的客户redis key前缀 /// - public const string TrackPushKeyPrefix = "TrackPush:"; + public const string TrackPushKeyPrefix = "TrackPush"; /// /// 轨迹拉取配置信息redis key前缀 /// - public const string TrackPullConfigInfoKeyPrefix = "TrackPullConfigInfo:"; + public const string TrackPullKeyPrefix = "TrackPull"; + + /// + /// 轨迹拉取配置信息redis key前缀 + /// + public const string TrackPullContentKeyPrefix = "TrackPullContent"; } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs b/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs new file mode 100644 index 00000000..45309ad5 --- /dev/null +++ b/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs @@ -0,0 +1,13 @@ +using SJZY.Track.Domain.Dtos.Order; + +namespace SJZY.Track.Domain.Queries; + +public interface ITrackOrderQueries +{ + /// + /// 获取分页的轨迹订单 + /// + /// + /// + Task> GetPageTrackOrder(GetPageTrackOrderInputVO input); +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs new file mode 100644 index 00000000..73a566d0 --- /dev/null +++ b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs @@ -0,0 +1,117 @@ +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; +using SJZY.Track.Domain.Dtos.Order; +using SJZY.Track.Domain.Queries; +using SJZY.Track.Domain.VEntities; +using SJZY.Track.Repository.VData.Entitys; + +namespace SJZY.Track.Repository.Queries; + +public class TrackOrderQueries : ISugarRepository, ITrackOrderQueries, + ITransientDependency +{ + public ISqlSugarClient Context { get; set; } + + public TrackOrderQueries() + { + Context = SqlsugarScopeBasic.GetContextSafely("default"); + } + + /// + /// 获取分页的轨迹订单 + /// + /// + /// + public async Task> GetPageTrackOrder(GetPageTrackOrderInputVO input) + { + List orderNoList = new List(); + List questionTypeIds = new List(); + int ques = 0; + if (!input.OrderNos.IsNullOrWhiteSpace()) + { + orderNoList = input.OrderNos!.Split(new[] { ',', '，', ':', '：' }).ToList(); + } + + if (input.TabType == 1) + { + questionTypeIds = new List { 1, 4 }; + ques = questionTypeIds.Sum(); + } + else if (input.TabType == 2) + { + questionTypeIds = new List { 2, 4 }; + ques = questionTypeIds.Sum(); + } + + var pageList = await Context.Queryable() + .LeftJoin((a, b) => a.CustomId == b.Id && b.IsDeleted == false) + .LeftJoin((a, b, c) => a.SubSystemId == c.Id && c.IsDeleted == false) + .WhereIF(input.SubSystemId > 0, (a, b, c) => a.SubSystemId == input.SubSystemId) + .WhereIF(!orderNoList.IsNullOrEmpty(), (a, b, c) => orderNoList.Contains(a.OrderNo)) + .WhereIF(input.CreateTimeStart.HasValue && input.CreateTimeEnd.HasValue, + (a, b, c) => a.CreateTime >= input.CreateTimeStart && a.CreateTime <= input.CreateTimeEnd) + .WhereIF(input.CreateTimeStart.HasValue && (!input.CreateTimeEnd.HasValue), + (a, b, c) => a.CreateTime >= input.CreateTimeStart) + .WhereIF((!input.CreateTimeStart.HasValue) && input.CreateTimeEnd.HasValue, + (a, b, c) => a.CreateTime <= input.CreateTimeEnd) + .WhereIF(input.CustomerId > 0, (a, b, c) => a.CustomId == input.CustomerId) + .WhereIF(input.TrackOrderType > 0, (a, b, c) => a.OrderType == input.TrackOrderType) + .WhereIF(input.TabType > 0 && !questionTypeIds.IsNullOrEmpty(), (a, b, c) => (a.QuestionType & ques) > 0) + .OrderByDescending((a, b, c) => a.CreateTime) + .Select((a, b, c) => new TrackOrderVO + { + Id = a.Id, + OrderNumber = a.OrderNo, + OrderType = a.OrderType, + OrderTypeName = SqlFunc.IF(a.OrderType == 1).Return("干线提单").ElseIF(a.OrderType == 2).Return("小包运单") + .ElseIF(a.OrderType == 3) + .Return("箱/袋单").ElseIF(a.OrderType == 4).Return("FBA订单").End(""), + CustomerShortName = b.Abbreviation, + CustomerCode = b.Code, + CustomerId = a.CustomId, + QuestionType = a.QuestionType, + QuestionTypeName = SqlFunc.IF(a.QuestionType == 1).Return("异常").ElseIF(a.QuestionType == 2).Return("预警") + .End(""), + ProblemDescription = a.ProblemDescription, + ProblemDescriptionName = SqlFunc.IF(a.ProblemDescription == 1).Return("推送异常") + .ElseIF(a.ProblemDescription == 2).Return("推送预警").End(""), + //TrackTemplateNames = SqlFunc.Subqueryable() + // .LeftJoin((aa, bb) => aa.TrackTemplateId == bb.Id) + // .Where((aa, bb) => a.Id == aa.OrderId).SelectStringJoin((aa, bb) => bb.Name, ","), + + //TrackTemplateIds = SqlFunc.Subqueryable() + // .LeftJoin((aa, bb) => aa.TrackTemplateId == bb.Id) + // .Where((aa, bb) => a.Id == aa.OrderId).SelectStringJoin((aa, bb) => bb.Id, ","), + NewestTrackContent = a.LatestTrackContent, + NewestTrackEnContent = a.LatestTrackEnContent, + NewestTrackPlace = a.LatestTrackPlace, + NewestTrackTime = a.LatestTrackTime, + IsFinish = a.IsCompleted, + CreateTime = a.CreateTime, + SubSystem = c.CnName, + SubSystemId = c.Id + }) + .ToPagedListAsync(input.PageIndex, input.PageSize); + + if (pageList.List.Any()) + { + //查询也需要最新的轨迹 + var orderIds = pageList.List.Select(a => a.Id).ToList(); + //查询轨迹模版 + var trackTemplateList = await Context.Queryable() + .LeftJoin((a, b) => a.TrackTemplateId == b.Id) + .Where((a, b) => orderIds.Contains(a.OrderId)) + .Select((a, b) => new { a.OrderId, b.Name, TemplateId = b.Id }) + .ToListAsync(); + pageList.List.ForEach(a => + { + a.TrackTemplateNames = trackTemplateList.Where(b => b.OrderId == a.Id).Select(x => x.Name) + .JoinAsString(","); + a.TrackTemplateIds = trackTemplateList.Where(b => b.OrderId == a.Id).Where(b => b.TemplateId > 0) + .Select(x => x.TemplateId).ToList(); + }); + } + + return pageList; + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs index e160ec0b..aac0ef93 100644 --- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs @@ -1,25 +1,12 @@ using SJZY.Track.Domain; using SJZY.Track.Domain.Aggregates.OrderAggregate; -using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; using SJZY.Track.Domain.Dtos.Order; using SJZY.Track.Domain.VEntities; -using SJZY.Track.Repository.VData.Entitys; -using SqlSugar; namespace SJZY.Track.Repository.Repositories; public class OrderRepository : BasicRepository, IOrderRepository, ITransientDependency { - private readonly ITrackDetailsRepository _trackDetailsRepository; - - public OrderRepository( - ITrackDetailsRepository trackDetailsRepository - ) - { - this._trackDetailsRepository = trackDetailsRepository; - } - public async Task CreateOrderAsync(OrderEntity order) { using var tran = TransactionHelper.GetReadCommitted(); @@ -98,180 +85,33 @@ public class OrderRepository : BasicRepository, IOrderRepository, I #endregion - #region 轨迹订单明细 - - ///// - ///// 根据轨迹订单id获取轨迹明细列表 - ///// - ///// - ///// - //public async Task> GetOrderDetails(GetOrderDetailsInputVO input) - //{ - // return null; - //} - - #endregion - - #region 轨迹订单分页 - - /// - /// 获取分页的轨迹订单 - /// - /// - /// - public async Task> GetPageTrackOrder(GetPageTrackOrderInputVO input) - { - List orderNoList = new List(); - List questionTypeIds = new List(); - int ques = 0; - if (!input.OrderNos.IsNullOrWhiteSpace()) - { - orderNoList = input.OrderNos.Split(new char[] { ',', '，', ':', '：' }).ToList(); - } - if (input.TabType==1) - { - questionTypeIds= new List { 1, 4 }; - ques = questionTypeIds.Sum(); - } - else if (input.TabType==2) - { - questionTypeIds= new List { 2, 4 }; - ques = questionTypeIds.Sum(); - } - - var pageList = await Context.Queryable() - .LeftJoin((a, b) => a.CustomId == b.Id && b.IsDeleted == false) - .LeftJoin((a, b, c) => a.SubSystemId == c.Id && c.IsDeleted == false) - .WhereIF(input.SubSystemId > 0, (a, b, c) => a.SubSystemId == input.SubSystemId) - .WhereIF(!orderNoList.IsNullOrEmpty(), (a, b, c) => orderNoList.Contains(a.OrderNo)) - .WhereIF(input.CreateTimeStart.HasValue && input.CreateTimeEnd.HasValue, - (a, b, c) => a.CreateTime >= input.CreateTimeStart && a.CreateTime <= input.CreateTimeEnd) - .WhereIF(input.CreateTimeStart.HasValue && (!input.CreateTimeEnd.HasValue), - (a, b, c) => a.CreateTime >= input.CreateTimeStart) - .WhereIF((!input.CreateTimeStart.HasValue) && input.CreateTimeEnd.HasValue, - (a, b, c) => a.CreateTime <= input.CreateTimeEnd) - .WhereIF(input.CustomerId>0, (a, b, c) => a.CustomId==input.CustomerId) - .WhereIF(input.TrackOrderType>0, (a, b, c) => a.OrderType==input.TrackOrderType) - .WhereIF(input.TabType>0 && (!questionTypeIds.IsNullOrEmpty()), (a, b, c) => (a.QuestionType&ques)>0) - .OrderByDescending((a, b, c) => a.CreateTime) - .Select((a, b, c) => new TrackOrderVO - { - Id = a.Id, - OrderNumber = a.OrderNo, - OrderType = a.OrderType, - OrderTypeName = SqlFunc.IF(a.OrderType == 1).Return("干线提单").ElseIF(a.OrderType == 2).Return("小包运单") - .ElseIF(a.OrderType == 3) - .Return("箱/袋单").ElseIF(a.OrderType == 4).Return("FBA订单").End(""), - CustomerShortName = b.Abbreviation, - CustomerCode = b.Code, - CustomerId = a.CustomId, - QuestionType = a.QuestionType, - QuestionTypeName = SqlFunc.IF(a.QuestionType == 1).Return("异常").ElseIF(a.QuestionType == 2).Return("预警").End(""), - ProblemDescription = a.ProblemDescription, - ProblemDescriptionName =SqlFunc.IF(a.ProblemDescription == 1).Return("推送异常").ElseIF(a.ProblemDescription == 2).Return("推送预警").End(""), - //TrackTemplateNames = SqlFunc.Subqueryable() - // .LeftJoin((aa, bb) => aa.TrackTemplateId == bb.Id) - // .Where((aa, bb) => a.Id == aa.OrderId).SelectStringJoin((aa, bb) => bb.Name, ","), - - //TrackTemplateIds = SqlFunc.Subqueryable() - // .LeftJoin((aa, bb) => aa.TrackTemplateId == bb.Id) - // .Where((aa, bb) => a.Id == aa.OrderId).SelectStringJoin((aa, bb) => bb.Id, ","), - NewestTrackContent = a.LatestTrackContent, - NewestTrackEnContent = a.LatestTrackEnContent, - NewestTrackPlace = a.LatestTrackPlace, - NewestTrackTime = a.LatestTrackTime, - IsFinish = a.IsCompleted, - CreateTime = a.CreateTime, - SubSystem = c.CnName, - SubSystemId = c.Id - }) - .ToPagedListAsync(input.PageIndex, input.PageSize); - - if (pageList.List.Any()) - { - //查询也需要最新的轨迹 - var orderIds = pageList.List.Select(a => a.Id).ToList(); - //查询轨迹模版 - var trackTemplateList = await Context.Queryable() - .LeftJoin((a, b) => a.TrackTemplateId == b.Id) - .Where((a, b) => orderIds.Contains(a.OrderId)) - .Select((a, b) => new { OrderId = a.OrderId, Name = b.Name, TemplateId = b.Id }) - .ToListAsync(); - var esTrackDetails = await _trackDetailsRepository.GetListAsync(orderIds); - pageList.List.ForEach(a => - { - var esDetails = esTrackDetails?.Where(b => b.OrderId == a.Id).OrderByDescending(b => b.TrackTime); - var trackDetail = esDetails?.FirstOrDefault(); - if (trackDetail != null) - { - if (trackDetail.TrackContent != a.NewestTrackContent) - { - a.NewestTrackContent = trackDetail.TrackContent; - } - - if (trackDetail.TrackEnContent != a.NewestTrackEnContent) - { - a.NewestTrackEnContent = trackDetail.TrackEnContent; - } - - if (trackDetail.TrackPlace != a.NewestTrackPlace) - { - a.NewestTrackPlace = trackDetail.TrackPlace; - } - - if (trackDetail.TrackTime != a.NewestTrackTime) - { - a.NewestTrackTime = trackDetail.TrackTime; - } - } - - a.TrackTemplateNames = trackTemplateList.Where(b => b.OrderId == a.Id).Select(a => a.Name) - .JoinAsString(","); - a.TrackTemplateIds = trackTemplateList.Where(b => b.OrderId == a.Id).Where(b => b.TemplateId>0).Select(a => a.TemplateId).ToList(); - }); - } - - - #region 暂时注释 - - //if (pageList.List.Any()) - //{ - // var orderIds = pageList.List.Select(a => a.Id); - // //查询轨迹模版 - - - // var trackTemplateList = await Context.Queryable() - // .LeftJoin((a, b) => a.TrackTemplateId==b.Id) - // .Where((a, b) => orderIds.Contains(a.OrderId)) - // .Select((a, b) => new { OrderId = a.OrderId, Name = b.Name }) - // .ToListAsync(); - - // pageList.List.ForEach(a => - // { - // var templateListOfOrderId = trackTemplateList.Where(b => b.OrderId== a.Id); - // a.TrackTemplateNames = templateListOfOrderId.Select(c => c.Name).JoinAsString(","); - // }); - //} - - #endregion - - return pageList; - } - - #endregion - - - public async Task> GetOrderTemplatesAsync(List orderNos) + public async Task> FindServiceProviderByOrderAsync(List orderNos) { return await Context.Queryable() .LeftJoin((a, b) => a.Id == b.OrderId) .LeftJoin((a, b, c) => b.ServiceProviderId == c.Id) .Where(a => orderNos.Contains(a.OrderNo)) - .Select((a, b, c) => new OrderTemplateVO + .Select((a, b, c) => new OrderServiceProviderVO + { + OrderNo = a.OrderNo, + OrderType = a.OrderType, + ServiceProviderId = b.ServiceProviderId, + ServiceProviderCode = c.Code, + SubSystemId = a.SubSystemId + }) + .ToListAsync(); + } + + public async Task> FindOrderByServiceProviderAsync(int serviceProvider) + { + return await Context.Queryable() + .RightJoin((a, b) => a.Id == b.OrderId) + .LeftJoin((a, b, c) => b.ServiceProviderId == c.Id) + .Where((a, b) => b.ServiceProviderId == serviceProvider && !a.IsCompleted) + .Select((a, b, c) => new OrderServiceProviderVO { OrderNo = a.OrderNo, OrderType = a.OrderType, - TemplateId = b.TrackTemplateId, ServiceProviderId = b.ServiceProviderId, ServiceProviderCode = c.Code, SubSystemId = a.SubSystemId