调整参数必填

This commit is contained in:
eli 2024-11-28 11:49:18 +08:00
parent 99bf506ab7
commit aa6b269f21

View File

@ -113,22 +113,25 @@ 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) if (orderId != null && orderId > 0)
whereExpression = m => m.Id == orderId; whereExpression = m => m.Id == orderId;
if (string.IsNullOrEmpty(orderNo) && systemId > 0) 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 (orderId == default && orderNo == default && systemId == 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>();