Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Application/Orders/OrderApplication.cs

@@ -1185,8 +1185,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             if (bool.Parse(enabled))
             {
                 //自动延期催办短信发送
-                await _capPublisher.PublishDelayAsync(  expiredTimeConfig.ExpiredTime - DateTime.Now.AddHours(2),
-                    EventNames.HotlineOrderAutomaticSendSmsDelay,  new PublishAutomaticDelayDto() { OrderId = order.Id }, cancellationToken: cancellationToken);
+                await _capPublisher.PublishDelayAsync(expiredTimeConfig.ExpiredTime - DateTime.Now.AddHours(2),
+                    EventNames.HotlineOrderAutomaticSendSmsDelay, new PublishAutomaticDelayDto() { OrderId = order.Id }, cancellationToken: cancellationToken);
 
                 await _capPublisher.PublishDelayAsync(
                     expiredTimeConfig.ExpiredTime - DateTime.Now.AddHours(1),
@@ -1431,8 +1431,15 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                         if (first.VisitOrgCode != OrgSeedData.CenterId &&
                             (first.OrgProcessingResults.Value == "不满意" || first.OrgProcessingResults.Value == "非常不满意"))
                         {
-                            var orderVisit = await _orderVisitRepository.Queryable().FirstAsync(x => x.Id == dto.Id, cancellationToken);
-                            if (string.IsNullOrEmpty(orderVisit.Employee.PhoneNo) == false)
+                            var roleJingBanRen = _systemSettingCacheManager.GetSetting(SettingConstants.AcceptSmsRoleIds)?.SettingValue;
+                            var userList = await _userRepository
+                                            .Queryable()
+                                            .Where(d => d.OrgId == first.VisitOrgCode &&
+                                                   d.Roles.Any(x => roleJingBanRen.Contains(x.Id)) &&
+                                                   string.IsNullOrEmpty(d.PhoneNo) == false)
+                                            .ToListAsync();
+
+                            foreach (var item in userList)
                             {
                                 var messageDto = new Share.Dtos.Push.MessageDto
                                 {
@@ -1441,10 +1448,10 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                                     OrderId = visit.Order.Id,
                                     PushPlatform = EPushPlatform.Sms,
                                     Remark = visit.Order.Title,
-                                    Name = orderVisit.Employee.Name,
+                                    Name = item.Name,
                                     TemplateCode = "1020",
                                     Params = new List<string>() { visit.Order.No },
-                                    TelNumber = orderVisit.Employee.PhoneNo,
+                                    TelNumber = item.PhoneNo,
                                 };
                                 await _mediator.Publish(new PushMessageNotify(messageDto), cancellationToken);
                             }