|
@@ -210,16 +210,16 @@ namespace Hotline.Application.Orders
|
|
|
await _orderPublishRepository.RemoveAsync(publish, false, cancellationToken);
|
|
|
}
|
|
|
|
|
|
- if (_appOptions.Value.IsYiBin)
|
|
|
- {
|
|
|
- var screen = await _orderScreenRepository.Queryable().FirstAsync(
|
|
|
- x => x.OrderId == model.OrderId &&
|
|
|
- (x.Status != EScreenStatus.End && x.Status != EScreenStatus.Refuse), cancellationToken);
|
|
|
- if (screen != null)
|
|
|
- {
|
|
|
- await _orderScreenRepository.RemoveAsync(screen, false, cancellationToken);
|
|
|
- }
|
|
|
+ //if (_appOptions.Value.IsYiBin)
|
|
|
+ //{
|
|
|
+ var screen = await _orderScreenRepository.Queryable().FirstAsync(
|
|
|
+ x => x.OrderId == model.OrderId &&
|
|
|
+ (x.Status != EScreenStatus.End && x.Status != EScreenStatus.Refuse), cancellationToken);
|
|
|
+ if (screen != null)
|
|
|
+ {
|
|
|
+ await _orderScreenRepository.RemoveAsync(screen, false, cancellationToken);
|
|
|
}
|
|
|
+ //}
|
|
|
|
|
|
await _workflowApplication.RecallAsync(recall, expiredTime.ExpiredTime, isOrderFiled, EWorkflowTraceType.SecondHandle, cancellationToken);
|
|
|
visit.VisitState = EVisitState.None;
|