ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'S06' into test

Browse Source
This commit is contained in:
云龙 王 2024-11-29 14:49:52 +08:00
commit 93dea380ea
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs
View File

@ -60,7 +60,9 @@ public partial class TrackService : ApplicationService, ITrackService
throw new BusinessException(message: "轨迹来源是必须的"); throw new BusinessException(message: "轨迹来源是必须的");
} }
if (input.TrackTime < DateTime.Now.AddYears(-100) || input.TrackTime > DateTime.Now.AddYears(100)) //要求时间在当前时间的前后100年之间内
bool ValidateTrackTime(DateTime? d) => (d != null && d < DateTime.Now.AddYears(-100) || d > DateTime.Now.AddYears(100));
if (ValidateTrackTime(input.TrackTime) || ValidateTrackTime(input.NewTrackTime))
{ {
throw new BusinessException(message: "轨迹时间不合法"); throw new BusinessException(message: "轨迹时间不合法");
} }
@ -326,7 +328,9 @@ public partial class TrackService : ApplicationService, ITrackService
//【更新】存在指定轨迹的内容（匹配到多条则不处理） //【更新】存在指定轨迹的内容（匹配到多条则不处理）
var order = orders.First(); var order = orders.First();
if (input.TrackTime < DateTime.Now.AddYears(-100) || input.TrackTime > DateTime.Now.AddYears(100)) //要求时间在当前时间的前后100年之间内
bool ValidateTrackTime(DateTime? d) => (d != null && d < DateTime.Now.AddYears(-100) || d > DateTime.Now.AddYears(100));
if (ValidateTrackTime(input.TrackTime) || ValidateTrackTime(input.NewTrackTime))
{ {
throw new BusinessException(message: "轨迹时间不合法"); throw new BusinessException(message: "轨迹时间不合法");
} }

15
src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
View File

@ -113,22 +113,27 @@ public class TrackOrderService : ApplicationService
/// <param name="systemId"></param> /// <param name="systemId"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GetDetails")] [HttpPost("GetDetails")]
public async Task<List<TrackOrderDetailDto>> GetTracksAsync(int orderId, string? orderNo, int systemId) public async Task<List<TrackOrderDetailDto>> GetTracksAsync(int? orderId, string? orderNo, int? systemId)
{ {
Expression<Func<OrderEntity, bool>> whereExpression = null; Expression<Func<OrderEntity, bool>>? whereExpression = null;
if (orderId > 0) //根据订单id查询
if (orderId != null && orderId > 0)
whereExpression = m => m.Id == orderId; whereExpression = m => m.Id == orderId;
if (string.IsNullOrEmpty(orderNo) && systemId > 0) //根据订单号+系统id查询
if (!string.IsNullOrEmpty(orderNo) && systemId != null && systemId > 0)
whereExpression = m => m.OrderNo == orderNo && m.SubSystemId == systemId; whereExpression = m => m.OrderNo == orderNo && m.SubSystemId == systemId;
if (whereExpression == default)
throw new BusinessException(message: "请求参数异常");
var subSystemId = await _orderRepository.GetFirstAsync(whereExpression, x => x.SubSystemId); var subSystemId = await _orderRepository.GetFirstAsync(whereExpression, x => x.SubSystemId);
if (subSystemId == default) if (subSystemId == default)
{ {
throw new BusinessException(message: "订单不存在"); throw new BusinessException(message: "订单不存在");
} }
var trackDetails = await _trackDetailsEsRepository.GetListAsync(orderId); var trackDetails = await _trackDetailsEsRepository.GetListAsync(orderId ?? 0);
if (trackDetails.IsNullOrEmpty()) if (trackDetails.IsNullOrEmpty())
{ {
return new List<TrackOrderDetailDto>(); return new List<TrackOrderDetailDto>();