|
|
@ -212,10 +212,7 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir |
|
|
|
{ |
|
|
|
foreach (var thirdLocationJobDto in list) |
|
|
|
{ |
|
|
|
if (thirdLocationJobDto.JobStatus == EnumJobStatus.Open || |
|
|
|
thirdLocationJobDto.JobStatus == EnumJobStatus.Partial || |
|
|
|
thirdLocationJobDto.JobStatus == EnumJobStatus.Doing || |
|
|
|
thirdLocationJobDto.JobStatus == EnumJobStatus.Wait) |
|
|
|
if (thirdLocationJobDto.JobStatus == EnumJobStatus.Open) |
|
|
|
{ |
|
|
|
await _thirdLocationJobAppService.CancelAsync(thirdLocationJobDto.Id).ConfigureAwait(false); |
|
|
|
} |
|
|
@ -226,14 +223,13 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (request.RequestStatus == EnumRequestStatus.Partial || request.RequestStatus == EnumRequestStatus.Handling || |
|
|
|
if (request.RequestStatus == EnumRequestStatus.Handling || |
|
|
|
request.RequestStatus == EnumRequestStatus.New) |
|
|
|
{ |
|
|
|
request.RequestStatus = EnumRequestStatus.Cancelled; |
|
|
|
await Task.CompletedTask.ConfigureAwait(false); |
|
|
|
await LocalEventBus.PublishAsync(new SfsCancelledEntityEventData<ThirdLocationRequest>(request), false).ConfigureAwait(false); |
|
|
|
await _repository.UpdateAsync(request).ConfigureAwait(false); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
else |
|
|
|