二次办理申请同意工单状态变更

src/Hotline.Application/Orders/OrderSecondaryHandlingApplication.cs

@@ -169,12 +169,12 @@ namespace Hotline.Application.Orders
                 var reTransactNum = order.ReTransactNum is null ? 1 : order.ReTransactNum + 1;
                 var expiredTime = _timeLimitDomainService.CalcEndTime(DateTime.Now, order.AcceptTypeCode);
                 var processType = step.FlowDirection == EFlowDirection.OrgToCenter || step.FlowDirection == EFlowDirection.CenterToCenter ? EProcessType.Zhiban : EProcessType.Jiaoban;
-                await _orderRepository.Updateable().SetColumns(o => new Order() { ExpiredTime = expiredTime.ExpiredTime, NearlyExpiredTime = expiredTime.NearlyExpiredTime,NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne, ReTransactNum = reTransactNum, ProcessType = processType,Status = EOrderStatus.Handling })
+                var isOrderFiled = order.Status >= EOrderStatus.Filed;
+				await _orderRepository.Updateable().SetColumns(o => new Order() { ExpiredTime = expiredTime.ExpiredTime, NearlyExpiredTime = expiredTime.NearlyExpiredTime,NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne, ReTransactNum = reTransactNum, ProcessType = processType,Status = EOrderStatus.Handling })
                     .Where(o => o.Id == order.Id).ExecuteCommandAsync(cancellationToken);
                 var orderDto = _mapper.Map<OrderDto>(order);
                 await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderExpiredTimeUpdate, orderDto, cancellationToken: cancellationToken);
 
-                await _workflowApplication.RecallAsync(recall, expiredTime.ExpiredTime, order.Status >= EOrderStatus.Filed, cancellationToken);
                 var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == model.OrderId);
                 if (publish != null)
                 {
@@ -189,7 +189,8 @@ namespace Hotline.Application.Orders
                     await _orderPublishHistoryRepository.AddAsync(publishHistory, cancellationToken);
                     await _orderPublishRepository.RemoveAsync(publish, false, cancellationToken);
                 }
-            }
+                await _workflowApplication.RecallAsync(recall, expiredTime.ExpiredTime, isOrderFiled, cancellationToken);
+			}
             else
             {
                 var visit = await _orderVisitRepository.GetAsync(x => x.OrderId == model.OrderId, cancellationToken);