Merge branch 'S06' into test
This commit is contained in:
commit
25a7f512cc
@ -40,7 +40,7 @@ public partial class OrderService : ApplicationService, IOrderService
|
||||
if ((input.EstimatedDeliveryDate.HasValue && input.DestinationTimeZone.HasValue == false) ||
|
||||
(input.EstimatedDeliveryDate.HasValue == false && input.DestinationTimeZone.HasValue))
|
||||
{
|
||||
throw new BusinessException(message: "【目的地时区】和【预计到达时间】必须同时输入");
|
||||
throw new BusinessException(message: "【预计签收时间】和【签收地时区】必须同时输入");
|
||||
}
|
||||
|
||||
var currentUser = CurrentUserRequest.CurrentUser;
|
||||
|
||||
@ -68,7 +68,7 @@ public partial class TrackService : ApplicationService, ITrackService
|
||||
if ((input.EstimatedDeliveryDate.HasValue == false && input.DestinationTimeZone.HasValue) ||
|
||||
(input.EstimatedDeliveryDate.HasValue && input.DestinationTimeZone.HasValue == false))
|
||||
{
|
||||
throw new BusinessException(message: "【目的地时区】和【预计到达时间】必须同时输入");
|
||||
throw new BusinessException(message: "【预计签收时间】和【签收地时区】必须同时输入");
|
||||
}
|
||||
|
||||
//当修改时,如果为来源为外部提供商则不允许修改
|
||||
@ -334,7 +334,7 @@ public partial class TrackService : ApplicationService, ITrackService
|
||||
if ((input.EstimatedDeliveryDate.HasValue == false && input.DestinationTimeZone.HasValue) ||
|
||||
(input.EstimatedDeliveryDate.HasValue && input.DestinationTimeZone.HasValue == false))
|
||||
{
|
||||
throw new BusinessException(message: "【目的地时区】和【预计到达时间】必须同时输入");
|
||||
throw new BusinessException(message: "【预计签收时间】和【签收地时区】必须同时输入");
|
||||
}
|
||||
|
||||
var trackContent = await _trackContentRepository.GetByCodeAsync(input.SubSystemId, input.TrackCode);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user