xf 1 сар өмнө
parent
commit
d31a17538d
42 өөрчлөгдсөн 65 нэмэгдсэн , 137 устгасан
  1. 1 1
      src/Hotline.Api/Controllers/AiController.cs
  2. 1 1
      src/Hotline.Api/Controllers/Bi/BiOrderController.cs
  3. 1 1
      src/Hotline.Api/Controllers/FwThirdController.cs
  4. 1 1
      src/Hotline.Api/Controllers/OrderApi/OrderCarbonCopyController.cs
  5. 1 1
      src/Hotline.Api/Controllers/OrderController.cs
  6. 1 1
      src/Hotline.Api/Controllers/OrderTerminateController.cs
  7. 0 1
      src/Hotline.Api/Controllers/Snapshot/SnapshotController.cs
  8. 1 1
      src/Hotline.Api/Controllers/Snapshot/SnapshotOrderController.cs
  9. 1 1
      src/Hotline.Api/Controllers/TestController.cs
  10. 1 1
      src/Hotline.Api/Controllers/WebPortalController.cs
  11. 0 1
      src/Hotline.Api/StartupHelper.cs
  12. 1 1
      src/Hotline.Application/Handlers/FlowEngine/WorkflowEndHandler.cs
  13. 1 8
      src/Hotline.Application/OrderApp/AiOrderVisitApplication.cs
  14. 1 1
      src/Hotline.Application/OrderApp/Handlers/OrderHandler/AddOrderPushMessageNotifyHandler.cs
  15. 1 1
      src/Hotline.Application/OrderApp/Handlers/OrderHandler/GetOrderDetailNotifyHandler.cs
  16. 1 1
      src/Hotline.Application/OrderApp/Handlers/OrderHandler/OrderRelateCallHandler.cs
  17. 1 1
      src/Hotline.Application/OrderApp/Handlers/OrderHandler/OrderVisitSmsHandler.cs
  18. 1 1
      src/Hotline.Application/OrderApp/Handlers/OrderHandler/TranspondCityNotifyHandler.cs
  19. 1 1
      src/Hotline.Application/OrderApp/Handlers/OrderHandler/UpdateOrderPushMessageNotifyHandler.cs
  20. 1 1
      src/Hotline.Application/OrderApp/Handlers/OrderScreenHandler/OrderScreenEndWorkflowHandler.cs
  21. 1 2
      src/Hotline.Application/OrderApp/Handlers/OrderScreenHandler/OrderScreenNextWorkflowHandler.cs
  22. 1 1
      src/Hotline.Application/OrderApp/Handlers/OrderScreenHandler/OrderScreenStartWorkflowHandler.cs
  23. 1 1
      src/Hotline.Application/OrderApp/Handlers/SnapshotHandler/GuiderSystemTimeoutHandler.cs
  24. 1 6
      src/Hotline.Application/OrderApp/IAiOrderVisitApplication.cs
  25. 3 8
      src/Hotline.Application/OrderApp/IOrderAnalysisApplication.cs
  26. 1 6
      src/Hotline.Application/OrderApp/IOrderApplication.cs
  27. 2 7
      src/Hotline.Application/OrderApp/IOrderCarbonCopyApplication.cs
  28. 1 6
      src/Hotline.Application/OrderApp/IOrderSecondaryHandlingApplication.cs
  29. 1 6
      src/Hotline.Application/OrderApp/IOrderSendBackAuditApplication.cs
  30. 1 1
      src/Hotline.Application/OrderApp/IOrderVisitApplication.cs
  31. 2 10
      src/Hotline.Application/OrderApp/OrderAnalysisApplication.cs
  32. 13 22
      src/Hotline.Application/OrderApp/OrderApplication.cs
  33. 1 1
      src/Hotline.Application/OrderApp/OrderCarbonCopyApplication.cs
  34. 10 21
      src/Hotline.Application/OrderApp/OrderSecondaryHandlingApplication.cs
  35. 1 3
      src/Hotline.Application/OrderApp/OrderSendBackAuditApplication.cs
  36. 1 2
      src/Hotline.Application/OrderApp/OrderVisitApplication.cs
  37. 1 1
      src/Hotline.Application/Snapshot/Notifications/SnapshotHandler.cs
  38. 1 2
      src/Hotline.Application/StatisticalReport/OrderReportApplication.cs
  39. 1 1
      src/Hotline.Application/Subscribers/DatasharingSubscriber.cs
  40. 1 1
      src/Hotline.Application/Subscribers/InternalCapSubscriber.cs
  41. 1 1
      test/Hotline.Tests/Application/OrderApplicationTest.cs
  42. 1 1
      test/Hotline.Tests/Application/OrderVisitApplicationTest.cs

+ 1 - 1
src/Hotline.Api/Controllers/AiController.cs

@@ -4,7 +4,6 @@ using DotNetCore.CAP;
 using Hotline.Ai.CallOut;
 using Hotline.Ai.Jths;
 using Hotline.Ai.Visit;
-using Hotline.Application.Orders;
 using Hotline.Application.Quality;
 using Hotline.Caching.Interfaces;
 using Hotline.Caching.Services;
@@ -28,6 +27,7 @@ using Org.BouncyCastle.Utilities;
 using SqlSugar;
 using System.Runtime.CompilerServices;
 using System.Threading;
+using Hotline.Application.OrderApp;
 using XF.Domain.Authentications;
 using XF.Domain.Constants;
 using XF.Domain.Exceptions;

+ 1 - 1
src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -1,7 +1,6 @@
 using Amazon.Runtime.Internal.Transform;
 using Hotline.Application.ExportExcel;
 using Hotline.Application.FlowEngine;
-using Hotline.Application.Orders;
 using Hotline.Application.StatisticalReport;
 using Hotline.Application.Systems;
 using Hotline.Caching.Interfaces;
@@ -48,6 +47,7 @@ using Hotline.Share.Dtos.File;
 using Hotline.File;
 using Hotline.KnowledgeBase;
 using DocumentFormat.OpenXml.Vml.Spreadsheet;
+using Hotline.Application.OrderApp;
 using Hotline.Share.Tools;
 using MediatR;
 using static Hotline.AppDefaults;

+ 1 - 1
src/Hotline.Api/Controllers/FwThirdController.cs

@@ -1,7 +1,7 @@
 using DocumentFormat.OpenXml.Office.CoverPageProps;
 using Hotline.Application.Bulletin;
 using Hotline.Application.Identity;
-using Hotline.Application.Orders;
+using Hotline.Application.OrderApp;
 using Hotline.Article;
 using Hotline.Caching.Interfaces;
 using Hotline.Configurations;

+ 1 - 1
src/Hotline.Api/Controllers/OrderApi/OrderCarbonCopyController.cs

@@ -1,4 +1,4 @@
-using Hotline.Application.Orders;
+using Hotline.Application.OrderApp;
 using Hotline.Caching.Interfaces;
 using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Settings;

+ 1 - 1
src/Hotline.Api/Controllers/OrderController.cs

@@ -5,7 +5,6 @@ using Hotline.Api.Filter;
 using Hotline.Application.CallCenter;
 using Hotline.Application.ExportExcel;
 using Hotline.Application.FlowEngine;
-using Hotline.Application.Orders;
 using Hotline.Application.Quality;
 using Hotline.Application.Snapshot;
 using Hotline.Application.Systems;
@@ -76,6 +75,7 @@ using SqlSugar;
 using System.Text;
 using System.Text.Json;
 using System.Threading;
+using Hotline.Application.OrderApp;
 using XF.Domain.Authentications;
 using XF.Domain.Cache;
 using XF.Domain.Exceptions;

+ 1 - 1
src/Hotline.Api/Controllers/OrderTerminateController.cs

@@ -22,9 +22,9 @@ using XF.Utility.EnumExtensions;
 using MapsterMapper;
 using Hotline.File;
 using Hotline.Application.FlowEngine;
+using Hotline.Application.OrderApp;
 using Hotline.FlowEngine.Workflows;
 using Hotline.Repository.SqlSugar.Extensions;
-using Hotline.Application.Orders;
 using Hotline.Share.Dtos.FlowEngine.Workflow;
 using Hotline.Share.Requests;
 using Hotline.Tools;

+ 0 - 1
src/Hotline.Api/Controllers/Snapshot/SnapshotController.cs

@@ -1,7 +1,6 @@
 using AngleSharp.Dom;
 using Fw.Utility.UnifyResponse;
 using Hotline.Api.Filter;
-using Hotline.Application.Orders;
 using Hotline.Application.Snapshot;
 using Hotline.Caching.Interfaces;
 using Hotline.File;

+ 1 - 1
src/Hotline.Api/Controllers/Snapshot/SnapshotOrderController.cs

@@ -1,6 +1,5 @@
 using Amazon.Runtime.Internal.Transform;
 using Hotline.Application.FlowEngine;
-using Hotline.Application.Orders;
 using Hotline.Application.Snapshot;
 using Hotline.Caching.Interfaces;
 using Hotline.Caching.Services;
@@ -24,6 +23,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using System.ComponentModel;
 using System.Text;
+using Hotline.Application.OrderApp;
 using XF.Domain.Authentications;
 using XF.Domain.Exceptions;
 using XF.Domain.Repository;

+ 1 - 1
src/Hotline.Api/Controllers/TestController.cs

@@ -4,7 +4,6 @@ using Hotline.Application.CallCenter;
 using Hotline.Application.ExportExcel;
 using Hotline.Application.FlowEngine;
 using Hotline.Application.JudicialManagement;
-using Hotline.Application.Orders;
 using Hotline.Application.Quality;
 using Hotline.Application.StatisticalReport;
 using Hotline.Caching.Interfaces;
@@ -54,6 +53,7 @@ using NETCore.Encrypt;
 using Senparc.Weixin.MP.AdvancedAPIs.MerChant;
 using SqlSugar;
 using System.Threading;
+using Hotline.Application.OrderApp;
 using XC.RSAUtil;
 using XF.Domain.Authentications;
 using XF.Domain.Cache;

+ 1 - 1
src/Hotline.Api/Controllers/WebPortalController.cs

@@ -1,6 +1,6 @@
 using DocumentFormat.OpenXml.Spreadsheet;
 using Hotline.Application.Bulletin;
-using Hotline.Application.Orders;
+using Hotline.Application.OrderApp;
 using Hotline.Article;
 using Hotline.Caching.Interfaces;
 using Hotline.Configurations;

+ 0 - 1
src/Hotline.Api/StartupHelper.cs

@@ -4,7 +4,6 @@ using System.Reflection;
 using System.Text;
 using Hotline.Application;
 using Hotline.Application.Jobs;
-using Hotline.Application.Orders;
 using Hotline.CallCenter.Configs;
 using Hotline.Configurations;
 using Hotline.DI;

+ 1 - 1
src/Hotline.Application/Handlers/FlowEngine/WorkflowEndHandler.cs

@@ -1,6 +1,6 @@
 using DotNetCore.CAP;
 using Hotline.Application.CallCenter;
-using Hotline.Application.Orders;
+using Hotline.Application.OrderApp;
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Tels;
 using Hotline.Configurations;

+ 1 - 8
src/Hotline.Application/Orders/AiOrderVisitApplication.cs → src/Hotline.Application/OrderApp/AiOrderVisitApplication.cs

@@ -1,17 +1,10 @@
 using Hotline.Orders;
-using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Ai;
-using Microsoft.AspNetCore.Http;
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using XF.Domain.Dependency;
 using XF.Domain.Repository;
 
-namespace Hotline.Application.Orders
+namespace Hotline.Application.OrderApp
 {
     public class AiOrderVisitApplication : IAiOrderVisitApplication, IScopeDependency
     {

+ 1 - 1
src/Hotline.Application/Orders/Handlers/OrderHandler/AddOrderPushMessageNotifyHandler.cs → src/Hotline.Application/OrderApp/Handlers/OrderHandler/AddOrderPushMessageNotifyHandler.cs

@@ -6,7 +6,7 @@ using Hotline.Share.Enums.Push;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
-namespace Hotline.Application.Orders.Handlers.OrderHandler
+namespace Hotline.Application.OrderApp.Handlers.OrderHandler
 {
     /// <summary>
     /// 新增工单发送短信

+ 1 - 1
src/Hotline.Application/Orders/Handlers/OrderHandler/GetOrderDetailNotifyHandler.cs → src/Hotline.Application/OrderApp/Handlers/OrderHandler/GetOrderDetailNotifyHandler.cs

@@ -2,7 +2,7 @@
 using Hotline.Orders.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Orders.Handlers.OrderHandler
+namespace Hotline.Application.OrderApp.Handlers.OrderHandler
 {
     public class GetOrderDetailNotifyHandler : INotificationHandler<GetOrderDetailNotify>
     {

+ 1 - 1
src/Hotline.Application/Orders/Handlers/OrderHandler/OrderRelateCallHandler.cs → src/Hotline.Application/OrderApp/Handlers/OrderHandler/OrderRelateCallHandler.cs

@@ -4,7 +4,7 @@ using Hotline.Share.Dtos.Order;
 using Hotline.Share.Mq;
 using XF.Domain.Dependency;
 
-namespace Hotline.Application.Orders.Handlers.OrderHandler
+namespace Hotline.Application.OrderApp.Handlers.OrderHandler
 {
     public class OrderRelateCallHandler : ICapSubscribe, ITransientDependency
     {

+ 1 - 1
src/Hotline.Application/Orders/Handlers/OrderHandler/OrderVisitSmsHandler.cs → src/Hotline.Application/OrderApp/Handlers/OrderHandler/OrderVisitSmsHandler.cs

@@ -9,7 +9,7 @@ using MediatR;
 using XF.Domain.Dependency;
 using XF.Domain.Repository;
 
-namespace Hotline.Application.Orders.Handlers.OrderHandler;
+namespace Hotline.Application.OrderApp.Handlers.OrderHandler;
 public class OrderVisitSmsHandler : INotificationHandler<ReceiveMessageNotify>
 {
     private readonly IOrderVisitDomainService _orderVisitDomainService;

+ 1 - 1
src/Hotline.Application/Orders/Handlers/OrderHandler/TranspondCityNotifyHandler.cs → src/Hotline.Application/OrderApp/Handlers/OrderHandler/TranspondCityNotifyHandler.cs

@@ -9,7 +9,7 @@ using MediatR;
 using Microsoft.Extensions.Logging;
 using XF.Domain.Repository;
 
-namespace Hotline.Application.Orders.Handlers.OrderHandler
+namespace Hotline.Application.OrderApp.Handlers.OrderHandler
 {
     // [Injection(AppScopes = EAppScope.YiBin)]
     public class TranspondCityNotifyHandler : INotificationHandler<OrderStartWorkflowNotify>

+ 1 - 1
src/Hotline.Application/Orders/Handlers/OrderHandler/UpdateOrderPushMessageNotifyHandler.cs → src/Hotline.Application/OrderApp/Handlers/OrderHandler/UpdateOrderPushMessageNotifyHandler.cs

@@ -6,7 +6,7 @@ using Hotline.Share.Enums.Push;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
-namespace Hotline.Application.Orders.Handlers.OrderHandler
+namespace Hotline.Application.OrderApp.Handlers.OrderHandler
 {
     public class UpdateOrderPushMessageNotifyHandler : INotificationHandler<UpdateOrderNotify>
     {

+ 1 - 1
src/Hotline.Application/Orders/Handlers/OrderScreenHandler/OrderScreenEndWorkflowHandler.cs → src/Hotline.Application/OrderApp/Handlers/OrderScreenHandler/OrderScreenEndWorkflowHandler.cs

@@ -16,7 +16,7 @@ using Microsoft.Extensions.Options;
 using XF.Domain.Authentications;
 using XF.Domain.Repository;
 
-namespace Hotline.Application.Orders.Handlers.OrderScreenHandler;
+namespace Hotline.Application.OrderApp.Handlers.OrderScreenHandler;
 public class OrderScreenEndWorkflowHandler : INotificationHandler<EndWorkflowNotify>
 {
     private readonly IOrderRepository _orderRepository;

+ 1 - 2
src/Hotline.Application/Orders/Handlers/OrderScreenHandler/OrderScreenNextWorkflowHandler.cs → src/Hotline.Application/OrderApp/Handlers/OrderScreenHandler/OrderScreenNextWorkflowHandler.cs

@@ -9,13 +9,12 @@ using Hotline.Share.Enums.Order;
 using Hotline.Share.Mq;
 using MapsterMapper;
 using MediatR;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 using XF.Domain.Authentications;
 using XF.Domain.Extensions;
 using XF.Domain.Repository;
 
-namespace Hotline.Application.Orders.Handlers.OrderScreenHandler;
+namespace Hotline.Application.OrderApp.Handlers.OrderScreenHandler;
 public class OrderScreenNextWorkflowHandler : INotificationHandler<NextStepNotify>
 {
     private readonly ICapPublisher _capPublisher;

+ 1 - 1
src/Hotline.Application/Orders/Handlers/OrderScreenHandler/OrderScreenStartWorkflowHandler.cs → src/Hotline.Application/OrderApp/Handlers/OrderScreenHandler/OrderScreenStartWorkflowHandler.cs

@@ -3,7 +3,7 @@ using Hotline.FlowEngine.WorkflowModules;
 using Hotline.Orders;
 using MediatR;
 
-namespace Hotline.Application.Orders.Handlers.OrderScreenHandler;
+namespace Hotline.Application.OrderApp.Handlers.OrderScreenHandler;
 
 public class OrderScreenStartWorkflowHandler : INotificationHandler<StartWorkflowNotify>
 {

+ 1 - 1
src/Hotline.Application/Orders/Handlers/SnapshotHandler/GuiderSystemTimeoutHandler.cs → src/Hotline.Application/OrderApp/Handlers/SnapshotHandler/GuiderSystemTimeoutHandler.cs

@@ -4,7 +4,7 @@ using Hotline.Share.Tools;
 using Hotline.Snapshot.Notifications;
 using MediatR;
 
-namespace Hotline.Application.Orders.Handlers.SnapshotHandler
+namespace Hotline.Application.OrderApp.Handlers.SnapshotHandler
 {
     /// <summary>
     /// 需求:坐席派给网格员的安全隐患工单若未推送成功超过4小时或者网格员超过4小时没回复,则自动流转到标注节点待标注列表

+ 1 - 6
src/Hotline.Application/Orders/IAiOrderVisitApplication.cs → src/Hotline.Application/OrderApp/IAiOrderVisitApplication.cs

@@ -1,13 +1,8 @@
 using Hotline.Orders;
 using Hotline.Share.Dtos.Ai;
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Hotline.Application.Orders
+namespace Hotline.Application.OrderApp
 {
     public interface IAiOrderVisitApplication
     {

+ 3 - 8
src/Hotline.Application/Orders/IOrderAnalysisApplication.cs → src/Hotline.Application/OrderApp/IOrderAnalysisApplication.cs

@@ -1,13 +1,8 @@
-using Hotline.Share.Dtos.Order;
+using Hotline.Orders;
+using Hotline.Share.Dtos.Order;
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Hotline.Orders;
 
-namespace Hotline.Application.Orders
+namespace Hotline.Application.OrderApp
 {
 	public interface IOrderAnalysisApplication
 	{

+ 1 - 6
src/Hotline.Application/Orders/IOrderApplication.cs → src/Hotline.Application/OrderApp/IOrderApplication.cs

@@ -2,24 +2,19 @@
 using Hotline.FlowEngine.Definitions;
 using Hotline.FlowEngine.Workflows;
 using Hotline.Orders;
-using Hotline.Repository.SqlSugar.Orders;
 using Hotline.Settings;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.DataSharing.PusherHotlineDto;
-using Hotline.Share.Dtos.FlowEngine;
 using Hotline.Share.Dtos.FlowEngine.Workflow;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Dtos.Order.Publish;
-using Hotline.Share.Enums.FlowEngine;
-using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Settings;
 using Hotline.Share.Requests;
 using Hotline.Users;
 using SqlSugar;
-using XF.Domain.Authentications;
 using XF.Domain.Exceptions;
 
-namespace Hotline.Application.Orders
+namespace Hotline.Application.OrderApp
 {
     public interface IOrderApplication
     {

+ 2 - 7
src/Hotline.Application/Orders/IOrderCarbonCopyApplication.cs → src/Hotline.Application/OrderApp/IOrderCarbonCopyApplication.cs

@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Hotline.Orders;
+using Hotline.Orders;
 using Hotline.Share.Dtos.Order.CarbonCopy;
 using SqlSugar;
 
-namespace Hotline.Application.Orders
+namespace Hotline.Application.OrderApp
 {
     public interface IOrderCarbonCopyApplication
     {

+ 1 - 6
src/Hotline.Application/Orders/IOrderSecondaryHandlingApplication.cs → src/Hotline.Application/OrderApp/IOrderSecondaryHandlingApplication.cs

@@ -2,13 +2,8 @@
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Requests;
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Hotline.Application.Orders
+namespace Hotline.Application.OrderApp
 {
 	public interface IOrderSecondaryHandlingApplication
 	{

+ 1 - 6
src/Hotline.Application/Orders/IOrderSendBackAuditApplication.cs → src/Hotline.Application/OrderApp/IOrderSendBackAuditApplication.cs

@@ -1,13 +1,8 @@
 using Hotline.Orders;
 using Hotline.Share.Dtos.Order;
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Hotline.Application.Orders
+namespace Hotline.Application.OrderApp
 {
 	public interface IOrderSendBackAuditApplication
 	{

+ 1 - 1
src/Hotline.Application/Orders/IOrderVisitApplication.cs → src/Hotline.Application/OrderApp/IOrderVisitApplication.cs

@@ -1,6 +1,6 @@
 using Hotline.Share.Dtos.Order;
 
-namespace Hotline.Application.Orders;
+namespace Hotline.Application.OrderApp;
 
 public interface IOrderVisitApplication
 {

+ 2 - 10
src/Hotline.Application/Orders/OrderAnalysisApplication.cs → src/Hotline.Application/OrderApp/OrderAnalysisApplication.cs

@@ -1,23 +1,15 @@
 using Hotline.Orders;
 using Hotline.Settings;
 using Hotline.Share.Dtos.Order;
+using Hotline.Share.Enums.Order;
 using MapsterMapper;
-using NPOI.SS.Formula.Functions;
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using Hotline.Share.Enums.Order;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
 using XF.Domain.Repository;
 using XF.Utility.SequentialId;
-using static Hotline.AppDefaults;
 
-namespace Hotline.Application.Orders
+namespace Hotline.Application.OrderApp
 {
 	public class OrderAnalysisApplication : IOrderAnalysisApplication, IScopeDependency
 	{

+ 13 - 22
src/Hotline.Application/Orders/OrderApplication.cs → src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -1,11 +1,20 @@
-using DotNetCore.CAP;
+using System.Data;
+using System.Dynamic;
+using DotNetCore.CAP;
+using ExtendedNumerics.Exceptions;
+using FluentValidation;
+using Hotline.Application.FlowEngine;
 using Hotline.Application.Quality;
+using Hotline.Article;
 using Hotline.Authentications;
 using Hotline.Caching.Interfaces;
 using Hotline.Configurations;
 using Hotline.File;
+using Hotline.FlowEngine.Definitions;
+using Hotline.FlowEngine.Notifications;
 using Hotline.FlowEngine.WorkflowModules;
 using Hotline.FlowEngine.Workflows;
+using Hotline.Identity.Roles;
 using Hotline.KnowledgeBase;
 using Hotline.Orders;
 using Hotline.OrderTranspond;
@@ -21,6 +30,7 @@ using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.DataSharing.PusherHotlineDto;
 using Hotline.Share.Dtos.File;
 using Hotline.Share.Dtos.FlowEngine;
+using Hotline.Share.Dtos.FlowEngine.Workflow;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Dtos.Order.Publish;
 using Hotline.Share.Dtos.Push;
@@ -35,39 +45,20 @@ using Hotline.Share.Requests;
 using Hotline.Statistics;
 using Hotline.Tools;
 using Hotline.Users;
+using Hotline.Validators.FlowEngine;
 using Mapster;
 using MapsterMapper;
 using MediatR;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using PanGu;
 using SqlSugar;
-using System.Data;
-using System.Dynamic;
-using ExtendedNumerics.Exceptions;
-using FluentValidation;
-using Hotline.FlowEngine.Definitions;
-using Hotline.FlowEngine.Notifications;
-using Hotline.Share.Dtos.FlowEngine.Workflow;
-using Hotline.Validators.FlowEngine;
 using XF.Domain.Authentications;
 using XF.Domain.Dependency;
-using XF.Domain.Entities;
 using XF.Domain.Exceptions;
 using XF.Domain.Repository;
 using WordInfo = PanGu.WordInfo;
-using Hotline.Repository.SqlSugar.Orders;
-using Quartz.Simpl;
-using J2N.Text;
-using Hotline.Application.FlowEngine;
-using Hotline.Article;
-using Hotline.Share.Dtos.CallCenter;
-using DocumentFormat.OpenXml.Bibliography;
-using Hotline.Identity.Accounts;
-using Hotline.Identity.Roles;
 
-namespace Hotline.Application.Orders;
+namespace Hotline.Application.OrderApp;
 
 public class OrderApplication : IOrderApplication, IScopeDependency
 {

+ 1 - 1
src/Hotline.Application/Orders/OrderCarbonCopyApplication.cs → src/Hotline.Application/OrderApp/OrderCarbonCopyApplication.cs

@@ -5,7 +5,7 @@ using XF.Domain.Authentications;
 using XF.Domain.Dependency;
 using XF.Domain.Repository;
 
-namespace Hotline.Application.Orders;
+namespace Hotline.Application.OrderApp;
 
 public class OrderCarbonCopyApplication : IOrderCarbonCopyApplication, IScopeDependency
 {

+ 10 - 21
src/Hotline.Application/Orders/OrderSecondaryHandlingApplication.cs → src/Hotline.Application/OrderApp/OrderSecondaryHandlingApplication.cs

@@ -1,39 +1,28 @@
 using DotNetCore.CAP;
+using FluentValidation;
 using Hotline.Application.FlowEngine;
+using Hotline.Configurations;
 using Hotline.File;
 using Hotline.FlowEngine.Workflows;
 using Hotline.Orders;
-using Hotline.Repository.SqlSugar.Orders;
+using Hotline.Settings;
+using Hotline.Settings.TimeLimitDomain;
 using Hotline.Settings.TimeLimits;
-using Hotline.Share.Dtos;
-using Hotline.Share.Dtos.FlowEngine;
+using Hotline.Share.Dtos.FlowEngine.Workflow;
 using Hotline.Share.Dtos.Order;
+using Hotline.Share.Enums.FlowEngine;
 using Hotline.Share.Enums.Order;
+using Hotline.Share.Requests;
+using Hotline.Validators.FlowEngine;
 using MapsterMapper;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 using SqlSugar;
-using System.Threading;
-using Hotline.Configurations;
-using Hotline.FlowEngine;
-using Hotline.Repository.SqlSugar.Extensions;
 using XF.Domain.Authentications;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
 using XF.Domain.Repository;
-using Hotline.Share.Requests;
-using Hotline.Settings;
-using Novacode;
-using Hotline.Share.Enums.FlowEngine;
-using Hotline.Settings.TimeLimitDomain;
-using Microsoft.Extensions.Options;
-using DocumentFormat.OpenXml.Office2010.Excel;
-using Hotline.Share.Dtos.FlowEngine.Workflow;
-using Hotline.Validators.FlowEngine;
-using FluentValidation;
-using Hotline.Authentications;
 
-namespace Hotline.Application.Orders
+namespace Hotline.Application.OrderApp
 {
     public class OrderSecondaryHandlingApplication : IOrderSecondaryHandlingApplication, IScopeDependency
     {

+ 1 - 3
src/Hotline.Application/Orders/OrderSendBackAuditApplication.cs → src/Hotline.Application/OrderApp/OrderSendBackAuditApplication.cs

@@ -1,7 +1,5 @@
 using Hotline.Orders;
 using Hotline.SeedData;
-using Hotline.Share.Dtos;
-using Hotline.Share.Dtos.Bi;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Enums.Order;
 using SqlSugar;
@@ -9,7 +7,7 @@ using XF.Domain.Authentications;
 using XF.Domain.Dependency;
 using XF.Domain.Repository;
 
-namespace Hotline.Application.Orders
+namespace Hotline.Application.OrderApp
 {
     public class OrderSendBackAuditApplication : IOrderSendBackAuditApplication, IScopeDependency
     {

+ 1 - 2
src/Hotline.Application/Orders/OrderVisitApplication.cs → src/Hotline.Application/OrderApp/OrderVisitApplication.cs

@@ -9,8 +9,7 @@ using SqlSugar;
 using XF.Domain.Dependency;
 using XF.Domain.Repository;
 
-
-namespace Hotline.Application.Orders;
+namespace Hotline.Application.OrderApp;
 
 /// <summary>
 /// 回访服务

+ 1 - 1
src/Hotline.Application/Snapshot/Notifications/SnapshotHandler.cs

@@ -21,7 +21,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Hotline.Application.Orders;
+using Hotline.Application.OrderApp;
 using Hotline.FlowEngine.Workflows;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;

+ 1 - 2
src/Hotline.Application/StatisticalReport/OrderReportApplication.cs

@@ -1,5 +1,4 @@
-using Hotline.Application.Orders;
-using Hotline.Caching.Interfaces;
+using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.Calls;
 using Hotline.FlowEngine.WorkflowModules;
 using Hotline.FlowEngine.Workflows;

+ 1 - 1
src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -2,7 +2,7 @@
 using FluentValidation;
 using Hotline.Application.CallCenter;
 using Hotline.Application.FlowEngine;
-using Hotline.Application.Orders;
+using Hotline.Application.OrderApp;
 using Hotline.Authentications;
 using Hotline.Caching.Interfaces;
 using Hotline.Caching.Services;

+ 1 - 1
src/Hotline.Application/Subscribers/InternalCapSubscriber.cs

@@ -1,5 +1,5 @@
 using DotNetCore.CAP;
-using Hotline.Application.Orders;
+using Hotline.Application.OrderApp;
 using Hotline.Caching.Interfaces;
 using Hotline.Configurations;
 using Hotline.FlowEngine.Workflows;

+ 1 - 1
test/Hotline.Tests/Application/OrderApplicationTest.cs

@@ -1,4 +1,4 @@
-using Hotline.Application.Orders;
+using Hotline.Application.OrderApp;
 using Hotline.Caching.Interfaces;
 using Hotline.Orders;
 using Hotline.Push.FWMessage;

+ 1 - 1
test/Hotline.Tests/Application/OrderVisitApplicationTest.cs

@@ -1,4 +1,4 @@
-using Hotline.Application.Orders;
+using Hotline.Application.OrderApp;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Tools;
 using Shouldly;