|
@@ -1801,7 +1801,7 @@ public class OrderController : BaseController
|
|
|
.Includes(d => d.OrderDelays)
|
|
|
.Includes(d => d.OrderScreens)
|
|
|
.Includes(d => d.OrderVisits, x => x.OrderVisitDetails)
|
|
|
- .Includes(d=> d.OrderVisits,x=>x.Employee)
|
|
|
+ .Includes(d => d.OrderVisits, x => x.Employee)
|
|
|
.FirstAsync(d => d.Id == id);
|
|
|
if (order == null)
|
|
|
return new();
|
|
@@ -1869,6 +1869,27 @@ public class OrderController : BaseController
|
|
|
|
|
|
//内容分词
|
|
|
await _orderApplication.OrderParticiple(dto.Content, order.Id, HttpContext.RequestAborted);
|
|
|
+
|
|
|
+ //sms
|
|
|
+ try
|
|
|
+ {
|
|
|
+ await _pushDomainService.PushAsync(new MessageDto
|
|
|
+ {
|
|
|
+ PushBusiness = EPushBusiness.OrderAccept,
|
|
|
+ ExternalId = order.Id,
|
|
|
+ OrderId = order.Id,
|
|
|
+ PushPlatform = EPushPlatform.Sms,
|
|
|
+ Content =
|
|
|
+ $"宜宾12345温馨提示:您的来电已受理(流水号:{order.No};提取码:{order.Password},可通过网站(http://hotline.12345lm.cn)进行查询,谢谢。【宜宾12345热线平台】)",
|
|
|
+ Remark = order.Title,
|
|
|
+ Name = order.FromName,
|
|
|
+ TelNumber = order.Contact
|
|
|
+ }, HttpContext.RequestAborted);
|
|
|
+ }
|
|
|
+ catch (Exception e)
|
|
|
+ {
|
|
|
+ _logger.LogError("新增工单发送短信失败,Error:{err}", e.Message);
|
|
|
+ }
|
|
|
return order.Id;
|
|
|
}
|
|
|
|
|
@@ -1959,28 +1980,6 @@ public class OrderController : BaseController
|
|
|
await Remove(id);
|
|
|
throw new UserFriendlyException($"工单开启流程失败!, {e.Message}", "工单开启流程失败");
|
|
|
}
|
|
|
-
|
|
|
- //sms
|
|
|
- try
|
|
|
- {
|
|
|
- var order = await _orderDomainService.GetOrderAsync(id, cancellationToken: HttpContext.RequestAborted);
|
|
|
- await _pushDomainService.PushAsync(new MessageDto
|
|
|
- {
|
|
|
- PushBusiness = EPushBusiness.OrderAccept,
|
|
|
- ExternalId = order.Id,
|
|
|
- OrderId = order.Id,
|
|
|
- PushPlatform = EPushPlatform.Sms,
|
|
|
- Content =
|
|
|
- $"宜宾12345温馨提示:您的来电已受理(流水号:{order.No};提取码:{order.Password},可通过网站(http://hotline.12345lm.cn)进行查询,谢谢。【宜宾12345热线平台】)",
|
|
|
- Remark = order.Title,
|
|
|
- Name = order.FromName,
|
|
|
- TelNumber = order.Contact
|
|
|
- }, HttpContext.RequestAborted);
|
|
|
- }
|
|
|
- catch (Exception e)
|
|
|
- {
|
|
|
- _logger.LogError("新增工单发送短信失败,Error:{err}", e.Message);
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -3132,18 +3131,18 @@ public class OrderController : BaseController
|
|
|
await _orderRepository.UpdateAsync(order, HttpContext.RequestAborted);
|
|
|
}
|
|
|
|
|
|
- #endregion
|
|
|
+ #endregion
|
|
|
|
|
|
- #region 获取企业信息
|
|
|
+ #region 获取企业信息
|
|
|
/// <summary>
|
|
|
/// 获取企业信息
|
|
|
/// </summary>
|
|
|
/// <param name="dto"></param>
|
|
|
/// <returns></returns>
|
|
|
- [HttpGet("enterprise/List")]
|
|
|
- public async Task<EnterpriseListData> GetEnterpriseList([FromQuery] PagedKeywordRequest dto)
|
|
|
- {
|
|
|
- return await _enterpriseService.GetEnterpriseList(dto.Keyword!, dto.PageIndex,dto.PageSize, HttpContext.RequestAborted);
|
|
|
- }
|
|
|
- #endregion
|
|
|
+ [HttpGet("enterprise/List")]
|
|
|
+ public async Task<EnterpriseListData> GetEnterpriseList([FromQuery] PagedKeywordRequest dto)
|
|
|
+ {
|
|
|
+ return await _enterpriseService.GetEnterpriseList(dto.Keyword!, dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
|
|
|
+ }
|
|
|
+ #endregion
|
|
|
}
|