|
@@ -32,11 +32,10 @@ namespace DataSharing.Host.Controllers.ZiGong
|
|
|
public class TianQueController : BaseController
|
|
|
{
|
|
|
private readonly IMapper _mapper;
|
|
|
- private readonly IMediator _mediator;
|
|
|
private readonly ICapPublisher _capPublisher;
|
|
|
private readonly IChannelConfigurationManager _channelConfigurationManager;
|
|
|
private readonly IDsUserTokenInfoService _dsUserTokenInfoService;
|
|
|
- private readonly IRepository<DsReceiveMediaData> _dsReceiveMediaDataRepository;
|
|
|
+ private readonly IRepository<DsReceiveHandleData> _dsReceiveHandleDataRepository;
|
|
|
private readonly IHttpClientFactory _httpClientFactory;
|
|
|
private readonly FwClient _fwClient;
|
|
|
|
|
@@ -47,14 +46,14 @@ namespace DataSharing.Host.Controllers.ZiGong
|
|
|
/// <param name="capPublisher"></param>
|
|
|
/// <param name="channelConfigurationManager"></param>
|
|
|
/// <param name="dsUserTokenInfoService"></param>
|
|
|
- /// <param name="dsReceiveMediaDataRepository"></param>
|
|
|
+ /// <param name="dsReceiveHandleDataRepository"></param>
|
|
|
/// <param name="httpClientFactory"></param>
|
|
|
/// <param name="fwClient"></param>
|
|
|
public TianQueController(IMapper mapper,
|
|
|
ICapPublisher capPublisher,
|
|
|
IChannelConfigurationManager channelConfigurationManager,
|
|
|
IDsUserTokenInfoService dsUserTokenInfoService,
|
|
|
- IRepository<DsReceiveMediaData> dsReceiveMediaDataRepository,
|
|
|
+ IRepository<DsReceiveHandleData> dsReceiveHandleDataRepository,
|
|
|
IHttpClientFactory httpClientFactory,
|
|
|
FwClient fwClient)
|
|
|
{
|
|
@@ -62,7 +61,7 @@ namespace DataSharing.Host.Controllers.ZiGong
|
|
|
_capPublisher = capPublisher;
|
|
|
_channelConfigurationManager = channelConfigurationManager;
|
|
|
_dsUserTokenInfoService = dsUserTokenInfoService;
|
|
|
- _dsReceiveMediaDataRepository = dsReceiveMediaDataRepository;
|
|
|
+ _dsReceiveHandleDataRepository = dsReceiveHandleDataRepository;
|
|
|
_httpClientFactory = httpClientFactory;
|
|
|
_fwClient = fwClient;
|
|
|
}
|
|
@@ -76,15 +75,17 @@ namespace DataSharing.Host.Controllers.ZiGong
|
|
|
[AllowAnonymous]
|
|
|
public async Task<OpenResponse> ReceiverOpinion([FromBody] OrderResultOpinionDto dto)
|
|
|
{
|
|
|
- //写入原始数据
|
|
|
- DsReceiveMediaData dsReceiveMediaData = new()
|
|
|
+ //写入对外展示表数据
|
|
|
+ DsReceiveHandleData dsReceive = new()
|
|
|
{
|
|
|
- ServiceInterface = "WriteResult",
|
|
|
- PlatformsName = "天阙",
|
|
|
- ExternalId = dto.ReplyCode,
|
|
|
+ OrderNo = dto.ReplyCode,
|
|
|
+ Source = "随手拍天阙",
|
|
|
+ PlatformsName = "随手拍天阙",
|
|
|
+ OperationType = dto.ReplyResultType,
|
|
|
+ Opinion = dto.ReplyContent,
|
|
|
ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto)
|
|
|
};
|
|
|
- var id = await _dsReceiveMediaDataRepository.AddAsync(dsReceiveMediaData, HttpContext.RequestAborted);
|
|
|
+ var id = await _dsReceiveHandleDataRepository.AddAsync(dsReceive, HttpContext.RequestAborted);
|
|
|
|
|
|
var accountDto = await _dsUserTokenInfoService.CheckAccountAsync(dto.VailCode, HttpContext.RequestAborted);
|
|
|
if (accountDto is null || accountDto.IsCheckAccount == false)
|
|
@@ -143,15 +144,17 @@ namespace DataSharing.Host.Controllers.ZiGong
|
|
|
[AllowAnonymous]
|
|
|
public async Task<OpenResponse> SendSms([FromBody] SendSmsDto dto)
|
|
|
{
|
|
|
- //写入原始数据
|
|
|
- DsReceiveMediaData dsReceiveMediaData = new()
|
|
|
+ //写入对外展示表数据
|
|
|
+ DsReceiveHandleData dsReceive = new()
|
|
|
{
|
|
|
- ServiceInterface = "SendSMS",
|
|
|
- PlatformsName = "天阙",
|
|
|
- ExternalId = dto.ReplyCode,
|
|
|
+ OrderNo = dto.ReplyCode,
|
|
|
+ Source = "随手拍天阙",
|
|
|
+ PlatformsName = "随手拍天阙",
|
|
|
+ OperationType = "SMS",
|
|
|
+ Opinion = dto.SendType,
|
|
|
ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto)
|
|
|
};
|
|
|
- await _dsReceiveMediaDataRepository.AddAsync(dsReceiveMediaData, HttpContext.RequestAborted);
|
|
|
+ await _dsReceiveHandleDataRepository.AddAsync(dsReceive, HttpContext.RequestAborted);
|
|
|
|
|
|
var accountDto = await _dsUserTokenInfoService.CheckAccountAsync(dto.VailCode, HttpContext.RequestAborted);
|
|
|
if (accountDto is null || accountDto.IsCheckAccount == false)
|