|
@@ -1,4 +1,5 @@
|
|
using Hotline.DataSharing;
|
|
using Hotline.DataSharing;
|
|
|
|
+using Hotline.DataSharing.Order;
|
|
using Hotline.DataSharing.Province;
|
|
using Hotline.DataSharing.Province;
|
|
using Hotline.DataSharing.Province.Notifications;
|
|
using Hotline.DataSharing.Province.Notifications;
|
|
using Hotline.DataSharing.Province.XieTong.Receive;
|
|
using Hotline.DataSharing.Province.XieTong.Receive;
|
|
@@ -13,10 +14,8 @@ using MapsterMapper;
|
|
using MediatR;
|
|
using MediatR;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
-using System.Collections.Generic;
|
|
|
|
using XF.Domain.Filters;
|
|
using XF.Domain.Filters;
|
|
using XF.Domain.Repository;
|
|
using XF.Domain.Repository;
|
|
-using static System.Runtime.InteropServices.JavaScript.JSType;
|
|
|
|
|
|
|
|
namespace Hotline.Api.Controllers.DataSharing
|
|
namespace Hotline.Api.Controllers.DataSharing
|
|
{
|
|
{
|
|
@@ -33,6 +32,7 @@ namespace Hotline.Api.Controllers.DataSharing
|
|
private readonly IRepository<DsGetCaseBackApply> _getCaseBackApplyRepository;
|
|
private readonly IRepository<DsGetCaseBackApply> _getCaseBackApplyRepository;
|
|
private readonly IChannelConfigurationManager _channelConfigurationManager;
|
|
private readonly IChannelConfigurationManager _channelConfigurationManager;
|
|
private readonly IRepository<DsReceiveProvinceData> _dsReceiveProvinceDataRepository;
|
|
private readonly IRepository<DsReceiveProvinceData> _dsReceiveProvinceDataRepository;
|
|
|
|
+ private readonly IRepository<DsOrder> _dataOrderRepository;
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
///
|
|
///
|
|
@@ -44,13 +44,15 @@ namespace Hotline.Api.Controllers.DataSharing
|
|
/// <param name="getCaseBackApplyRepository"></param>
|
|
/// <param name="getCaseBackApplyRepository"></param>
|
|
/// <param name="channelConfigurationManager"></param>
|
|
/// <param name="channelConfigurationManager"></param>
|
|
/// <param name="dsReceiveProvinceDataRepository"></param>
|
|
/// <param name="dsReceiveProvinceDataRepository"></param>
|
|
|
|
+ /// <param name="dataOrderRepository"></param>
|
|
public ProvinceController(IMapper mapper,
|
|
public ProvinceController(IMapper mapper,
|
|
IMediator mediator,
|
|
IMediator mediator,
|
|
IRepository<DsGetCaseMaterialInfo> getCaseMaterialInfoRepository,
|
|
IRepository<DsGetCaseMaterialInfo> getCaseMaterialInfoRepository,
|
|
IRepository<DsSendCaseInfo> sendCaseInfoRepository,
|
|
IRepository<DsSendCaseInfo> sendCaseInfoRepository,
|
|
IRepository<DsGetCaseBackApply> getCaseBackApplyRepository,
|
|
IRepository<DsGetCaseBackApply> getCaseBackApplyRepository,
|
|
IChannelConfigurationManager channelConfigurationManager,
|
|
IChannelConfigurationManager channelConfigurationManager,
|
|
- IRepository<DsReceiveProvinceData> dsReceiveProvinceDataRepository)
|
|
|
|
|
|
+ IRepository<DsReceiveProvinceData> dsReceiveProvinceDataRepository,
|
|
|
|
+ IRepository<DsOrder> dataOrderRepository)
|
|
{
|
|
{
|
|
_mapper = mapper;
|
|
_mapper = mapper;
|
|
_mediator = mediator;
|
|
_mediator = mediator;
|
|
@@ -59,6 +61,7 @@ namespace Hotline.Api.Controllers.DataSharing
|
|
_getCaseBackApplyRepository = getCaseBackApplyRepository;
|
|
_getCaseBackApplyRepository = getCaseBackApplyRepository;
|
|
_channelConfigurationManager = channelConfigurationManager;
|
|
_channelConfigurationManager = channelConfigurationManager;
|
|
_dsReceiveProvinceDataRepository = dsReceiveProvinceDataRepository;
|
|
_dsReceiveProvinceDataRepository = dsReceiveProvinceDataRepository;
|
|
|
|
+ _dataOrderRepository = dataOrderRepository;
|
|
}
|
|
}
|
|
#endregion
|
|
#endregion
|
|
|
|
|
|
@@ -401,6 +404,9 @@ namespace Hotline.Api.Controllers.DataSharing
|
|
|
|
|
|
if (!string.IsNullOrEmpty(id))
|
|
if (!string.IsNullOrEmpty(id))
|
|
{
|
|
{
|
|
|
|
+ var data= await _dataOrderRepository.GetAsync(p => p.ProvinceNo == dto.CaseSerial, HttpContext.RequestAborted);
|
|
|
|
+ if (data != null)
|
|
|
|
+ await _mediator.Send(new CancelOrderAsyncNotify { Opinion = dto.RevokeReasion, OrderId = data.OrderId });
|
|
//向业务系统推送消息
|
|
//向业务系统推送消息
|
|
// await _capPublisher.PublishAsync(Sharing.Share.Mq.EventNames.SharingOrderRevoke, _mapper.Map<RevokeDto>(dto), cancellationToken: HttpContext.RequestAborted);
|
|
// await _capPublisher.PublishAsync(Sharing.Share.Mq.EventNames.SharingOrderRevoke, _mapper.Map<RevokeDto>(dto), cancellationToken: HttpContext.RequestAborted);
|
|
return OpenResponse.Ok(Reponse.Success("您已成功提交数据!"));
|
|
return OpenResponse.Ok(Reponse.Success("您已成功提交数据!"));
|
|
@@ -756,7 +762,6 @@ namespace Hotline.Api.Controllers.DataSharing
|
|
break;
|
|
break;
|
|
case "revoke_case_info":
|
|
case "revoke_case_info":
|
|
listFiles = await InitFileData(listData, "工单撤单");
|
|
listFiles = await InitFileData(listData, "工单撤单");
|
|
-
|
|
|
|
break;
|
|
break;
|
|
case "send_warn_info":
|
|
case "send_warn_info":
|
|
listFiles = await InitFileData(listData, "工单预警");
|
|
listFiles = await InitFileData(listData, "工单预警");
|