diff --git a/src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs
index 6d8646ef..6e3d3987 100644
--- a/src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs
+++ b/src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs
@@ -79,4 +79,9 @@ public class TrackPushCompletedEvent
/// 推送内容(json)
///
public string PushContent { get; set; } = null!;
+
+ ///
+ /// 轨迹的额外新
+ ///
+ public string? Extra { get; set; }
}
diff --git a/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj b/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
index 7645500b..1912b1d1 100644
--- a/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
+++ b/src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
@@ -5,7 +5,7 @@
net7.0
True
- 7.0.8
+ 7.0.9
True
diff --git a/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPushService.cs b/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPushService.cs
index 4ddeb81d..b7029aa6 100644
--- a/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPushService.cs
+++ b/src/SJZY.Track.Application.Contract/Services/ProvideServices/ITrackPushService.cs
@@ -12,7 +12,7 @@ public interface ITrackPushService : IRemoteService
///
///
///
- public Task PushTrackAsync(PushTrackInput input);
+ public Task PushTrackAsync(PushTrackInput input);
///
/// 获取轨迹推送内容
@@ -20,12 +20,12 @@ public interface ITrackPushService : IRemoteService
///
/// 子系统id
/// 客户id
- public Task> GetTrackPushContentListAsync(int subSystemId, int customerId);
+ public Task>> GetTrackPushContentListAsync(int subSystemId, int customerId);
///
/// 获取轨迹推送记录
///
///
///
- public Task> GetTrackPushRecordsAsync(OrderNoInfo input);
+ public Task>> GetTrackPushRecordsAsync(OrderNoInfo input);
}
diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs
index a4e74aeb..e98c7cde 100644
--- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs
+++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs
@@ -125,7 +125,8 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
TrackTimeZone = @event.SystemPushInfo.TrackTimeZone,
CreateUser = GlobalConst.SystemUser,
SubSystemCode = @event.SubSystemCode,
- IsToMq = @event.IsToMq
+ IsToMq = @event.IsToMq,
+ Extra = @event.SystemPushInfo.Extra
};
var item = await BuiltPushItem(config, log, @event.SystemPushInfo.Extra);
item.Log = JsonConvert.SerializeObject(log);
@@ -173,7 +174,8 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
TrackTimeZone = track.TrackTimeZone,
CreateUser = @event.OperationMan,
SubSystemCode = @event.SubSystemCode,
- IsToMq = @event.IsToMq
+ IsToMq = @event.IsToMq,
+ Extra = track.Extra
};
var item = await BuiltPushItem(config, log, track.Extra);
item.Log = JsonConvert.SerializeObject(log);
@@ -223,7 +225,8 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
TrackTimeZone = @event.SystemPushInfo.TrackTimeZone,
CreateUser = GlobalConst.SystemUser,
SubSystemCode = @event.SubSystemCode,
- IsToMq = @event.IsToMq
+ IsToMq = @event.IsToMq,
+ Extra = @event.SystemPushInfo.Extra
};
var item = BuiltUpdateItem(config, log, @event.SystemPushInfo.Extra);
item.Log = JsonConvert.SerializeObject(log);
diff --git a/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs b/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs
index 68b3ddea..ad52c841 100644
--- a/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs
+++ b/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs
@@ -93,7 +93,8 @@ public class BroadcastingService : ITransientDependency
TrackTimeZone = log.TrackTimeZone,
TrackTime = log.TrackTime,
TrackPlace = log.TrackPlace,
- TrackCode = log.TrackCode
+ TrackCode = log.TrackCode,
+ Extra = log.Extra
};
_rabbitClientBus.Publish(GlobalConst.TrackPushExchange, $"TrackPush.{log.SubSystemCode}", Encoding.UTF8.GetBytes(data.ToJson()));
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
index 49000107..ce902649 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
@@ -49,7 +49,7 @@ public class TrackPushService : ApplicationService, ITrackPushService
///
[HttpPost("Track/Push")]
[CustomerResult]
- public async Task PushTrackAsync(PushTrackInput input)
+ public async Task PushTrackAsync(PushTrackInput input)
{
input.OrderNos = input.OrderNos.Where(x => !x.IsNullOrWhiteSpace()).Distinct().ToList(); // 单号去重、去空
@@ -92,7 +92,7 @@ public class TrackPushService : ApplicationService, ITrackPushService
await _capPublisher.PublishAsync(GlobalConst.TrackManualPushSubscribe, trackPushEvent);
}
- return $"即将推送轨迹代码{input.TrackCode}给{orders.Length}个订单";
+ return new UnifyResultDto(true,$"即将推送轨迹代码{input.TrackCode}给{orders.Length}个订单");
}
@@ -104,13 +104,13 @@ public class TrackPushService : ApplicationService, ITrackPushService
///
[HttpGet("Track/GetTrackPushContentList")]
[CustomerResult]
- public async Task> GetTrackPushContentListAsync(int subSystemId, int customerId)
+ public async Task>> GetTrackPushContentListAsync(int subSystemId, int customerId)
{
var list = await _trackPushConfigRepository.GetTrackPushContentListAsync(subSystemId, customerId);
var result = ObjectMapper.Map, List>(list);
- return result;
+ return new UnifyResultDto>(true, result, "操作成功");
}
///
@@ -120,7 +120,7 @@ public class TrackPushService : ApplicationService, ITrackPushService
///
[HttpGet("Track/GetTrackPushRecords")]
[CustomerResult]
- public async Task> GetTrackPushRecordsAsync([FromQuery] OrderNoInfo input)
+ public async Task>> GetTrackPushRecordsAsync([FromQuery] OrderNoInfo input)
{
var orderId = await _orderRepository.GetFirstAsync(x =>
x.SubSystemId == input.SubSystemId && x.OrderType == input.OrderType && input.OrderNo == x.OrderNo,
@@ -132,6 +132,7 @@ public class TrackPushService : ApplicationService, ITrackPushService
var records = await _trackPushRecordEsRepository.GetTrackPushRecordsAsync(orderId);
- return ObjectMapper.Map, List>(records);
+ var res = ObjectMapper.Map, List>(records);
+ return new UnifyResultDto>(true, res, "操作成功");
}
}
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs
index f124ce46..5e4b7865 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs
@@ -140,11 +140,14 @@ public partial class TrackService : ApplicationService, ITrackService
throw new BusinessException(message: $"订单:{input.OrderNo},轨迹代码:{input.TrackCode}存在多条记录,不允许修改");
}
- var userInfo = await _requestCurrentUserService.Service.GetCurrentUserBasicInfoAsync(input.OptionUserId);
+ var userInfo = await _requestCurrentUserService.Service.GetCurrentUserBasicInfoAsync();
if (userInfo.Code != GlobalConst.SuccessCode || userInfo.Data is null)
{
- //TODO: log || ex
- throw new BusinessException(message: $"调用用户中心,获取用户信息失败:{userInfo.Msg}");
+ //todo:保留之前的方式 后续可去除
+ userInfo = await _requestCurrentUserService.Service.GetCurrentUserBasicInfoAsync(input.OptionUserId);
+ if (userInfo.Code != GlobalConst.SuccessCode || userInfo.Data is null)
+ //TODO: log || ex
+ throw new BusinessException(message: $"调用用户中心,获取用户信息失败:{userInfo.Msg}");
}
var name = userInfo.Data.UserName;
diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs
index c8731039..d127b5c4 100644
--- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs
+++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs
@@ -92,4 +92,9 @@ public class TrackPushRecordIndex : IdBaseIndex
/// 是否广播
///
public bool IsToMq { get; set; }
+
+ ///
+ /// 轨迹额外信息
+ ///
+ public string? Extra { get; set; }
}
diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
index 413097c8..90e6c5bf 100644
--- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
@@ -1,4 +1,3 @@
-using NUglify.Helpers;
using SJZY.Expand.ABP.Core.Logger;
using SJZY.Track.Domain;
using SJZY.Track.Domain.Aggregates.OrderAggregate;