冲突

src/Hotline.Application/Orders/OrderApplication.cs

@@ -2267,8 +2267,6 @@ public class OrderApplication : IOrderApplication, IScopeDependency
     }
 
 
-
-	#region private
     #region private
     /// <summary>
     /// 接受外部工单（除省平台）
@@ -2276,8 +2274,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
     /// <param name="dto"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    private async Task<AddOrderResponse> ReceiveOrderFromOtherPlatformAsync(AddOrderDto dto, List<FileDto> files, CancellationToken cancellationToken)
-        ISessionContext current, CancellationToken cancellationToken)
+    private async Task<AddOrderResponse> ReceiveOrderFromOtherPlatformAsync(AddOrderDto dto, List<FileDto> files,ISessionContext current, CancellationToken cancellationToken)
     {
         if (string.IsNullOrEmpty(dto.ExternalId))
             throw new UserFriendlyException("工单外部编号不能为空");
@@ -2371,10 +2368,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 //await _workflowDomainService.RecallToStartStepAsync(order.WorkflowId, "省工单重派", current, order.Status >= EOrderStatus.Filed, cancellationToken);
                 await _workflowDomainService.RecallToCenterFirstToSendAsync(order.WorkflowId, "省工单重派", order.Status >= EOrderStatus.Filed,
                     order.ExpiredTime, cancellationToken);
-                //await _workflowDomainService.RecallToStartStepAsync(order.WorkflowId, "省工单重派", current, cancellationToken);
-            }
+            //await _workflowDomainService.RecallToStartStepAsync(order.WorkflowId, "省工单重派", current, cancellationToken);
         }
-
         return _mapper.Map<AddOrderResponse>(order);
     }
 
@@ -2562,5 +2557,5 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 
 	}
 	#endregion
-	#endregion
+
 }