Merge branch 'S07' into test

This commit is contained in:
hardstylewyl 2025-04-23 15:00:45 +08:00
commit 0b860d03d2

View File

@ -570,9 +570,20 @@ public partial class TrackService : ApplicationService, ITrackService
} }
var track = tracks.First(); var track = tracks.First();
if (DateTimeHelper.ConvertUtc0Compare(track.TrackTime, track.TrackTimeZone, trackTime, trackTimezone) != 0) // todo-remove:为了照顾FBA老逻辑,暂时特殊处理一下
if (track.SubSystemId == 9517)
{ {
throw new BusinessException(message: $"订单:[{orderNo}],轨迹代码:[{trackCode}]找不到要更新的记录,不允许修改,请检查轨迹TrackTime"); if (track.TrackTime != trackTime)
{
throw new BusinessException(message: $"订单:[{orderNo}],轨迹代码:[{trackCode}]找不到要更新的记录,不允许修改,请检查轨迹TrackTime");
}
}
else
{
if (DateTimeHelper.ConvertUtc0Compare(track.TrackTime, track.TrackTimeZone, trackTime, trackTimezone) != 0)
{
throw new BusinessException(message: $"订单:[{orderNo}],轨迹代码:[{trackCode}]找不到要更新的记录,不允许修改,请检查轨迹TrackTime");
}
} }
if (!string.Equals(track.Extra, extra)) if (!string.Equals(track.Extra, extra))