Merge remote-tracking branch 'origin/master'

src/Hotline.Api/Controllers/AiController.cs

@@ -212,6 +212,8 @@ namespace Hotline.Api.Controllers
                                 ClientGuid = ""
                             }, cancellationToken: HttpContext.RequestAborted);
 
+
+
                         }
                         else
                         {

src/Hotline.Api/Controllers/OrderController.cs

@@ -712,6 +712,18 @@ public class OrderController : BaseController
                             FirstSatisfactionCode = visit.Order.FirstVisitResultCode!,
                             ClientGuid = ""
                         }, cancellationToken: HttpContext.RequestAborted);
+
+                //推门户
+                await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderVisitedWeb, new PublishVisitAllDto(){ 
+                     Id = visit.Id,
+                     Order = orderDto,
+                     OrderVisitDetails = _mapper.Map<List<VisitDetailDto>>(visit.OrderVisitDetails),
+                     VisitName = _sessionContext.UserName,
+                     VisitTime = visit.VisitTime,
+                     VisitType = visit.VisitType,
+                     VisitState=visit.VisitState,
+                     PublishTime = visit.PublishTime,
+                },cancellationToken:HttpContext.RequestAborted);
                 //try
                 //{
                 //    await _provinceService.SubmitVisitInfo(new PublishVisitDto()

src/Hotline.Share/Dtos/Order/OrderVisitDto.cs

@@ -391,6 +391,42 @@ namespace Hotline.Share.Dtos.Order
         public int ErrorCount { get; set; }
     }
 
+    public class PublishVisitAllDto
+    {
+        public OrderDto? Order { get; set; }
+
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 回访状态
+        /// </summary>
+        public EVisitState VisitState { get; set; }
+
+        /// <summary>
+        /// 回访方式
+        /// </summary>
+        public EVisitType? VisitType { get; set; }
+
+        public string? VisitName { get; set; }
+
+        /// <summary>
+        /// 回访时间
+        /// </summary>
+        public DateTime? VisitTime { get; set; }
+
+
+        /// <summary>
+        /// 回访明细
+        /// </summary>
+        public List<VisitDetailDto> OrderVisitDetails { get; set; }
+
+        /// <summary>
+        /// 发布时间
+        /// </summary>
+        public DateTime PublishTime { get; set; }
+    }
+
+
     public class PublishVisitDto
     {
         /// <summary>

src/Hotline.Share/Hotline.Share.csproj

@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591;8618;</NoWarn>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.49</Version>
+    <Version>1.0.51</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/Hotline.Share/Mq/EventNames.Order.cs

@@ -39,10 +39,15 @@ namespace Hotline.Share.Mq
         public const string HotlineOrderFiled = "hotline.order.filed";
 
         /// <summary>
-        /// 回访完成
+        /// 回访完成（推省上）
         /// </summary>
         public const string HotlineOrderVisited = "hotline.order.visited";
 
+        /// <summary>
+        /// 回访完成（回访全量数据(Web\WeChat\App)）
+        /// </summary>
+        public const string HotlineOrderVisitedWeb = "hotline.order.visited.web";
+
         /// <summary>
         /// 甄别申请
         /// </summary>

src/Hotline.Share/Mq/EventNames.Share.cs

@@ -74,5 +74,11 @@
         /// 处理办理流程----AddOrderTracesDto
         /// </summary>
         public const string SharingOrderAddTraces = "sharing.order.add.traces";
+
+        /// <summary>
+        /// 提交评价信息(门户等第三方，提交全部部门的评价)
+        /// </summary>
+        public const string SharingOrderVisitAllOther = "sharing.order.visit.all.other";
+
     }
 }