Merge branch 'release' of http://git.12345lm.cn/Fengwo/hotline into release

src/Hotline.Api/Controllers/HotSpotController.cs

@@ -62,6 +62,7 @@ namespace Hotline.Api.Controllers
                     HotSpotFullName = x.HotSpotFullName,
                     ProvinceCode = x.ProvinceCode,
                     HasChild = SqlFunc.Subqueryable<Hotspot>().Where(d=>d.ParentId == x.Id).NotAny(),
+                    TrunkNum = x.TrunkNum,
                 }).ToListAsync();
 
             return list;
@@ -86,8 +87,8 @@ namespace Hotline.Api.Controllers
                 HotSpotFullName = x.HotSpotFullName,
                 ProvinceCode = x.ProvinceCode,
                 HasChild = SqlFunc.Subqueryable<Hotspot>().Where(d => d.ParentId == x.Id).NotAny(),
-
-            }).ToTreeAsync(x => x.Children, it => it.ParentId,"", arr);
+                TrunkNum = x.TrunkNum,
+			}).ToTreeAsync(x => x.Children, it => it.ParentId,"", arr);
         }
 
 

src/Hotline.Api/Controllers/OrderController.cs

@@ -918,7 +918,8 @@ public class OrderController : BaseController
         var histories = await _orderVisitRepository.Queryable()
             .Includes(m => m.OrderVisitDetails)
             .Where(m => m.OrderId == orderVisit.OrderId)
-            .Select(m => new OrderVisitDetailHistiryDto
+            .Where(m => m.VisitState == EVisitState.None && m.NowEvaluate != null)
+            .Select(m => new OrderVisitDetailHistoryDto
             {
                 VoiceEvaluate = m.OrderVisitDetails.Where(n => n.VisitTarget == EVisitTarget.Seat).Select(s => s.VoiceEvaluate).First(),
                 SeatEvaluate = m.OrderVisitDetails.Where(n => n.VisitTarget == EVisitTarget.Seat).Select(s => s.SeatEvaluate).First(),

src/Hotline.Api/Realtimes/HotlineHub.cs

@@ -108,6 +108,7 @@ namespace Hotline.Api.Realtimes
         public async Task JoinGroupUnauthAsync(JoinGroupDto dto)
         {
             CheckIfConnected();
+            await Groups.RemoveFromGroupAsync(Context.ConnectionId, dto.GroupName);
             await Groups.AddToGroupAsync(Context.ConnectionId, dto.GroupName);
             await Clients.Group(dto.GroupName).SendAsync("Send", $"{Context.ConnectionId} has joined the group {dto.GroupName}.");
         }

src/Hotline.Application/Jobs/XingTangTelOperationSyncJob.cs

@@ -65,7 +65,9 @@ namespace Hotline.Application.Jobs
             {
                 var operations = _mapper.Map<List<TelOperation>>(occupyOperations);
                 //填充user信息
-                var staffNos = operations.Select(d => d.StaffNo).ToList();
+                var staffNos = operations
+                    .Where(d=>!string.IsNullOrEmpty(d.StaffNo) && d.StaffNo != "0")
+                    .Select(d => d.StaffNo).ToList();
                 var users = await _userRepository.Queryable()
                     .Where(d => staffNos.Contains(d.StaffNo))
                     .ToListAsync(context.CancellationToken);

src/Hotline.Application/Orders/OrderApplication.cs

@@ -2022,12 +2022,12 @@ public class OrderApplication : IOrderApplication, IScopeDependency
     private async Task<AddOrderResponse> ReceiveOrderFromProvinceAsync(AddOrderDto dto, List<FileDto> files,
         ISessionContext current, CancellationToken cancellationToken)
     {
-        if (string.IsNullOrEmpty(dto.ProvinceNo))
+        if (string.IsNullOrEmpty(dto.ReceiveProvinceNo))
             throw new UserFriendlyException("无效省工单编号");
 
-        var orderExtension = await _orderDomainService.GetOrderExtensionsAsync(dto.ProvinceNo, cancellationToken);
+        var orderExtension = await _orderDomainService.GetOrderExtensionsAsync(dto.ReceiveProvinceNo, cancellationToken);
 
-        var order = await _orderRepository.GetAsync(d => d.ProvinceNo == dto.ProvinceNo, cancellationToken);
+        var order = await _orderRepository.GetAsync(d => d.ReceiveProvinceNo == dto.ReceiveProvinceNo, cancellationToken);
         if (order is null)
         {
             order = _mapper.Map<Order>(dto);

src/Hotline.Repository.SqlSugar/Orders/OrderVisitRepository.cs

@@ -38,6 +38,7 @@ public class OrderVisitRepository : BaseRepository<OrderVisit>, IOrderVisitRepos
     /// <returns></returns>
     public async Task UpdateSmsReplyAsync(PushReceiveMessageDto dto, Message data)
     {
+        _logger.LogInformation($"UpdateSmsReplyAsync 收到通知: {dto.ToJson()}");
         if (dto.IsSmsReply == false || dto.SmsReplyContent.IsNullOrEmpty() || dto.ExternalId.IsNullOrEmpty()) return;
 
         var orderVisit = await GetAsync(dto.ExternalId)

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

@@ -858,7 +858,7 @@ namespace Hotline.Share.Dtos.Order
     /// <summary>
     /// 回访详情的历史记录
     /// </summary>
-    public class OrderVisitDetailHistiryDto
+    public class OrderVisitDetailHistoryDto
     {
         public EVoiceEvaluate? VoiceEvaluate { get; set; }
         public string? VoiceEvaluateTxt => this.VoiceEvaluate?.GetDescription();