|
@@ -3843,31 +3843,28 @@ public class OrderController : BaseController
|
|
|
{
|
|
|
#region 旅游督办短信内容
|
|
|
|
|
|
- var acceptSmsRoleIds = _systemSettingCacheManager.GetSetting(SettingConstants.AcceptSmsRoleIds)?.SettingValue;
|
|
|
+ //var acceptSmsRoleIds = _systemSettingCacheManager.GetSetting(SettingConstants.AcceptSmsRoleIds)?.SettingValue;
|
|
|
//查询部门所有账号
|
|
|
- var userlist = await _userRepository.Queryable().Where(x =>
|
|
|
- x.OrgId == model.OrgId && x.PhoneNo == dto.PhoneNo &&
|
|
|
- x.Roles.Any(d => acceptSmsRoleIds.Contains(d.Id))).ToListAsync();
|
|
|
+ //var userlist = await _userRepository.Queryable().Where(x =>
|
|
|
+ // x.OrgId == model.OrgId && x.PhoneNo == dto.PhoneNo &&
|
|
|
+ // x.Roles.Any(d => acceptSmsRoleIds.Contains(d.Id))).ToListAsync();
|
|
|
|
|
|
var Contact = !string.IsNullOrEmpty(order.FromPhone) ? order.FromPhone : order.Contact;
|
|
|
|
|
|
//发送短信
|
|
|
- if (userlist != null && userlist.Count > 0)
|
|
|
+ var messageDto = new Share.Dtos.Push.MessageDto
|
|
|
{
|
|
|
- var messageDto = new Share.Dtos.Push.MessageDto
|
|
|
- {
|
|
|
- PushBusiness = EPushBusiness.OrderSupervise,
|
|
|
- ExternalId = order.Id,
|
|
|
- OrderId = order.Id,
|
|
|
- PushPlatform = EPushPlatform.Sms,
|
|
|
- Remark = order.Title,
|
|
|
- Name = userlist[0].Name,
|
|
|
- TemplateCode = "1022",
|
|
|
- Params = new List<string>() { dto.ApplyContent, order.No, Contact, order.Content },
|
|
|
- TelNumber = userlist[0].PhoneNo,
|
|
|
- };
|
|
|
- await _mediator.Publish(new PushMessageNotify(messageDto), HttpContext.RequestAborted);
|
|
|
- }
|
|
|
+ PushBusiness = EPushBusiness.OrderSupervise,
|
|
|
+ ExternalId = order.Id,
|
|
|
+ OrderId = order.Id,
|
|
|
+ PushPlatform = EPushPlatform.Sms,
|
|
|
+ Remark = order.Title,
|
|
|
+ Name = dto.PhoneNo,//userlist[0].Name,
|
|
|
+ TemplateCode = "1022",
|
|
|
+ Params = new List<string>() { dto.ApplyContent, order.No, Contact, order.Content },
|
|
|
+ TelNumber = dto.PhoneNo,
|
|
|
+ };
|
|
|
+ await _mediator.Publish(new PushMessageNotify(messageDto), HttpContext.RequestAborted);
|
|
|
|
|
|
#endregion
|
|
|
}
|