Merge branch 'test' into feature/reverse_step_create_policy

.gitignore

@@ -344,3 +344,4 @@ ASALocalRun/
 
 # BeatPulse healthcheck temp database
 healthchecksdb
+/merge.ps1

src/Hotline.Api/Controllers/CommonPController.cs

@@ -498,7 +498,8 @@ namespace Hotline.Api.Controllers
 				.Includes(x => x.OrderVisit, y => y.Employee)
 				.Includes(x => x.OrderScreens)
 				.Where(x => x.OrderScreens.Any(s => s.Status == EScreenStatus.SendBack && s.ScreenType ==  EOrderScreenType.Org && s.SendBackApply == true) || x.OrderScreens.Any() == false)
-				.Where(x => x.OrderVisit.VisitState == EVisitState.Visited && x.OrderVisit.IsCanHandle)
+                .Where(x => x.OrderVisit.Order.ReceiveProvinceNo.StartsWith("ZGZFW") == false || string.IsNullOrEmpty(x.OrderVisit.Order.ReceiveProvinceNo))
+                .Where(x => x.OrderVisit.VisitState == EVisitState.Visited && x.OrderVisit.IsCanHandle)
 				.Where(x => x.VisitTarget == EVisitTarget.Org && x.VisitOrgCode == _sessionContext.OrgId && (
 					SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "1" ||
 					SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "2" ||

src/Hotline.Application.Tests/Startup.cs

@@ -59,6 +59,9 @@ using Hotline.Application.Tests.SqlSuger;
 using Microsoft.AspNetCore.Http;
 using Hotline.WeChat;
 using Hotline.Api.Controllers.Snapshot;
+using Hotline.Orders.DatabaseEventHandler;
+using Hotline.Orders;
+using XF.Domain.Repository.Events;
 
 namespace Hotline.Application.Tests;
 public class Startup
@@ -151,9 +154,10 @@ public class Startup
                 .ToList()
                 .ForEach(d => ServiceRegister.Register(services, d));
 
-            //services.AddScoped<IThirdIdentiyService, WeChatService>();
-            services.AddScoped<IThirdIdentiyService, ThirdTestService>();
             // services.AddScoped<IThirdIdentiyService, WeChatService>();
+            services.AddScoped<IThirdIdentiyService, ThirdTestService>();
+
+            services.AddScoped<IUpdateDatabaseEvent<OrderVisitDetail>, OrderVisitDetailEventHandler>();
 
             //services.AddScoped<IThirdAccountRepository, ThirdAccountRepository>();
             services.AddApplication();

src/Hotline.Application/Orders/OrderApplication.cs

@@ -3017,7 +3017,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                          x.OrderScreens.Any() == false
              //|| x.OrderScreens.Any(s => (s.Status != EScreenStatus.SendBack && s.SendBackApply != true)) == false
              )
-             .Where(x=> x.OrderVisit.Order.ReceiveProvinceNo.StartsWith("ZGZFW")==false)
+             .Where(x=> x.OrderVisit.Order.ReceiveProvinceNo.StartsWith("ZGZFW")==false || string.IsNullOrEmpty(x.OrderVisit.Order.ReceiveProvinceNo))
              .WhereIF(dto.ScreenType == EOrderScreenType.Seat, x => x.OrderVisit.Order.IsProvince == false)
              .WhereIF(dto.ScreenSendBack is 1,
                  x => x.OrderScreens.Any(s => s.Status == EScreenStatus.SendBack && s.ScreenType == dto.ScreenType && s.SendBackApply == true))

src/Hotline/Orders/OrderVisitDetail.cs

@@ -105,7 +105,6 @@ namespace Hotline.Orders
         public void ReplyBackfill(Kv visitSatisfactionKv)
         {
             this.OrgProcessingResults = visitSatisfactionKv;
-            this.OrgHandledAttitude = visitSatisfactionKv;
             this.VisitContent = visitSatisfactionKv.Value;
         }
 

src/Hotline/Orders/OrderVisitDomainService.cs

@@ -12,6 +12,8 @@ using XF.Domain.Exceptions;
 using XF.Domain.Repository;
 using Hotline.EventBus;
 using Hotline.Orders.Notifications;
+using Hotline.Configurations;
+using Microsoft.Extensions.Options;
 
 namespace Hotline.Orders;
 public class OrderVisitDomainService : IOrderVisitDomainService, IScopeDependency
@@ -23,8 +25,9 @@ public class OrderVisitDomainService : IOrderVisitDomainService, IScopeDependenc
     private readonly IOrderVisitRepository _orderVisitRepository;
     private readonly ICapPublisher _capPublisher;
     private readonly Publisher _publisher;
+    private readonly IOptionsSnapshot<AppConfiguration> _appOptions;
 
-    public OrderVisitDomainService(IRepository<OrderVisitDetail> orderVisitDetailRepository, ILogger<OrderVisitDomainService> logger, IRepository<Order> orderRepository, ISystemDicDataCacheManager systemDicDataCacheManager, IOrderVisitRepository orderVisitRepository, ICapPublisher capPublisher, Publisher publisher)
+    public OrderVisitDomainService(IRepository<OrderVisitDetail> orderVisitDetailRepository, ILogger<OrderVisitDomainService> logger, IRepository<Order> orderRepository, ISystemDicDataCacheManager systemDicDataCacheManager, IOrderVisitRepository orderVisitRepository, ICapPublisher capPublisher, Publisher publisher, IOptionsSnapshot<AppConfiguration> appOptions)
     {
         _orderVisitDetailRepository = orderVisitDetailRepository;
         _logger = logger;
@@ -33,6 +36,7 @@ public class OrderVisitDomainService : IOrderVisitDomainService, IScopeDependenc
         _orderVisitRepository = orderVisitRepository;
         _capPublisher = capPublisher;
         _publisher = publisher;
+        _appOptions = appOptions;
     }
 
     /// <summary>
@@ -164,6 +168,8 @@ public class OrderVisitDomainService : IOrderVisitDomainService, IScopeDependenc
         foreach (var item in detailOrg)
         {
             item.ReplyBackfill(visitSatisfactionKv);
+            if (_appOptions.Value.IsZiGong)
+                item.OrgHandledAttitude = visitSatisfactionKv;
         }
         await _orderVisitDetailRepository.UpdateRangeAsync(detailOrg);