|
@@ -101,43 +101,47 @@ namespace Hotline.Application.Handlers.FlowEngine
|
|
|
// // e.Message);
|
|
|
// //}
|
|
|
//}
|
|
|
-
|
|
|
- var targetStep = notification.TargetStep;
|
|
|
- switch (targetStep.HandlerType)
|
|
|
+ if (notification.Dto.AcceptSms)
|
|
|
{
|
|
|
- case EHandlerType.Role:
|
|
|
- case EHandlerType.AssignedUser:
|
|
|
- var users = await _userRepository.Queryable()
|
|
|
- .Where(d => targetStep.Handlers.Select(x => x.Key).Contains(d.Id))
|
|
|
- .ToListAsync(cancellationToken);
|
|
|
- foreach (var user in users)
|
|
|
- {
|
|
|
- if (!string.IsNullOrEmpty(user.PhoneNo))
|
|
|
+ var targetStep = notification.TargetStep;
|
|
|
+
|
|
|
+ switch (targetStep.HandlerType)
|
|
|
+ {
|
|
|
+ case EHandlerType.Role:
|
|
|
+ case EHandlerType.AssignedUser:
|
|
|
+ var users = await _userRepository.Queryable()
|
|
|
+ .Where(d => targetStep.Handlers.Select(x => x.Key).Contains(d.Id))
|
|
|
+ .ToListAsync(cancellationToken);
|
|
|
+ foreach (var user in users)
|
|
|
{
|
|
|
- var messageDto = new MessageDto()
|
|
|
+ if (!string.IsNullOrEmpty(user.PhoneNo))
|
|
|
{
|
|
|
- PushBusiness = EPushBusiness.OrderCallback,
|
|
|
- ExternalId = order.Id,
|
|
|
- OrderId = order.Id,
|
|
|
- PushPlatform = EPushPlatform.Sms,
|
|
|
- Remark = order.Title,
|
|
|
- Name = user.PhoneNo,
|
|
|
- TemplateCode = "1004",
|
|
|
- Params = new List<string>() { order.No },
|
|
|
- TelNumber = user.PhoneNo,
|
|
|
- };
|
|
|
- await _mediator.Publish(new PushMessageNotify(messageDto), cancellationToken);
|
|
|
+ var messageDto = new MessageDto()
|
|
|
+ {
|
|
|
+ PushBusiness = EPushBusiness.OrderSendBack,
|
|
|
+ ExternalId = order.Id,
|
|
|
+ OrderId = order.Id,
|
|
|
+ PushPlatform = EPushPlatform.Sms,
|
|
|
+ Remark = order.Title,
|
|
|
+ Name = user.PhoneNo,
|
|
|
+ TemplateCode = "1004",
|
|
|
+ Params = new List<string>() { order.No },
|
|
|
+ TelNumber = user.PhoneNo,
|
|
|
+ };
|
|
|
+ await _mediator.Publish(new PushMessageNotify(messageDto), cancellationToken);
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- break;
|
|
|
- case EHandlerType.OrgLevel:
|
|
|
- case EHandlerType.OrgType:
|
|
|
- case EHandlerType.AssignedOrg:
|
|
|
- //todo 部门经办人联系方式
|
|
|
- break;
|
|
|
- default:
|
|
|
- throw new ArgumentOutOfRangeException();
|
|
|
+ break;
|
|
|
+ case EHandlerType.OrgLevel:
|
|
|
+ case EHandlerType.OrgType:
|
|
|
+ case EHandlerType.AssignedOrg:
|
|
|
+ //todo 部门经办人联系方式
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ throw new ArgumentOutOfRangeException();
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
|
|
|
break;
|
|
|
case WorkflowModuleConsts.OrderDelay:
|