This commit is contained in:
2025-09-16 17:42:09 +09:00
parent f53aa99874
commit aab8165c81
8 changed files with 20 additions and 20 deletions

View File

@ -14,9 +14,9 @@ namespace Hcs.Client.Api
/// <param name="payload">Пейлоад сведений о платежных документах</param>
/// <param name="token">Токен отмены</param>
/// <returns>true, если операция выполнена успешно, иначе - false</returns>
public async Task<bool> ImportPaymentDocumentAsync(ImportPaymentDocumentPayload payload, CancellationToken token = default)
public async Task<bool> ImportPaymentDocumentDataAsync(ImportPaymentDocumentDataPayload payload, CancellationToken token = default)
{
var request = new ImportPaymentDocumentRequest(client);
var request = new ImportPaymentDocumentDataRequest(client);
return await request.ExecuteAsync(payload, token);
}
}

View File

@ -18,7 +18,7 @@ namespace Hcs.Client.Api
/// <returns>Лицевые счета</returns>
public async Task<IEnumerable<exportMeteringDeviceHistoryResultType>> ExportMeteringDeviceHistoryAsync(ExportMeteringDeviceHistoryPayload payload, CancellationToken token = default)
{
var request = new ExportMeteringDeviceHistory(client);
var request = new ExportMeteringDeviceHistoryRequest(client);
return await request.ExecuteAsync(payload, token);
}

View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace Hcs.Client.Api.Payload.Bills
{
// http://open-gkh.ru/Bills/importPaymentDocumentRequest.html
public class ImportPaymentDocumentPayload
public class ImportPaymentDocumentDataPayload
{
// http://open-gkh.ru/Bills/importPaymentDocumentRequest/PaymentInformation.html
public class PaymentInformation

View File

@ -11,11 +11,11 @@ using System.Threading.Tasks;
namespace Hcs.Client.Api.Request.Bills
{
internal class ImportPaymentDocumentRequest(ClientBase client) : BillsRequestBase(client)
internal class ImportPaymentDocumentDataRequest(ClientBase client) : BillsRequestBase(client)
{
protected override bool CanBeRestarted => false;
internal async Task<bool> ExecuteAsync(ImportPaymentDocumentPayload payload, CancellationToken token)
internal async Task<bool> ExecuteAsync(ImportPaymentDocumentDataPayload payload, CancellationToken token)
{
// TODO: Добавить проверку пейлоада
@ -42,7 +42,7 @@ namespace Hcs.Client.Api.Request.Bills
return true;
}
private importPaymentDocumentRequest GetRequestFromPayload(ImportPaymentDocumentPayload payload)
private importPaymentDocumentRequest GetRequestFromPayload(ImportPaymentDocumentDataPayload payload)
{
var items = new List<object>();
if (payload.confirmAmountsCorrect)
@ -52,7 +52,7 @@ namespace Hcs.Client.Api.Request.Bills
items.Add(payload.month);
items.Add(payload.year);
var paymentInformations = new Dictionary<ImportPaymentDocumentPayload.PaymentInformation, importPaymentDocumentRequestPaymentInformation>();
var paymentInformations = new Dictionary<ImportPaymentDocumentDataPayload.PaymentInformation, importPaymentDocumentRequestPaymentInformation>();
foreach (var entry in payload.paymentInformation)
{
var paymentInformation = new importPaymentDocumentRequestPaymentInformation()
@ -71,7 +71,7 @@ namespace Hcs.Client.Api.Request.Bills
var chargeInfo = new List<object>();
foreach (var subEntry in entry.chargeInfo)
{
if (subEntry is ImportPaymentDocumentPayload.MunicipalService municipalService)
if (subEntry is ImportPaymentDocumentDataPayload.MunicipalService municipalService)
{
var item = new PDServiceChargeTypeMunicipalService()
{

View File

@ -9,7 +9,7 @@ using System.Threading.Tasks;
namespace Hcs.Client.Api.Request.DeviceMetering
{
internal class ExportMeteringDeviceHistory(ClientBase client) : DeviceMeteringRequestBase(client)
internal class ExportMeteringDeviceHistoryRequest(ClientBase client) : DeviceMeteringRequestBase(client)
{
protected override bool EnableMinimalResponseWaitDelay => false;

View File

@ -71,7 +71,7 @@
<Compile Include="Client\Api\NsiApi.cs" />
<Compile Include="Client\Api\NsiCommonApi.cs" />
<Compile Include="Client\Api\OrgRegistryCommonApi.cs" />
<Compile Include="Client\Api\Payload\Bills\ImportPaymentDocumentPayload.cs" />
<Compile Include="Client\Api\Payload\Bills\ImportPaymentDocumentDataPayload.cs" />
<Compile Include="Client\Api\Payload\DeviceMetering\ExportMeteringDeviceHistoryPayload.cs" />
<Compile Include="Client\Api\Payload\HouseManagement\ImportAccountDataPayload.cs" />
<Compile Include="Client\Api\Payload\HouseManagement\ImportContractDataPayload.cs" />
@ -98,9 +98,9 @@
<Compile Include="Client\Api\Request\Adapter\IGetStateResultMany.cs" />
<Compile Include="Client\Api\Request\Adapter\IGetStateResultOne.cs" />
<Compile Include="Client\Api\Request\Bills\BillsRequestBase.cs" />
<Compile Include="Client\Api\Request\Bills\ImportPaymentDocumentRequest.cs" />
<Compile Include="Client\Api\Request\Bills\ImportPaymentDocumentDataRequest.cs" />
<Compile Include="Client\Api\Request\DeviceMetering\DeviceMeteringRequestBase.cs" />
<Compile Include="Client\Api\Request\DeviceMetering\ExportMeteringDeviceHistory.cs" />
<Compile Include="Client\Api\Request\DeviceMetering\ExportMeteringDeviceHistoryRequest.cs" />
<Compile Include="Client\Api\Request\DeviceMetering\ImportMeteringDeviceValuesRequest.cs" />
<Compile Include="Client\Api\Request\Exception\NoResultsRemoteException.cs" />
<Compile Include="Client\Api\Request\GostSigningEndpointBehavior.cs" />

View File

@ -45,7 +45,7 @@ namespace Hcs.TestApp
var paymentsScenario = new PaymentsScenario(client);
try
{
//billsScenario.ImportPaymentDocument();
//billsScenario.ImportPaymentDocumentData();
//deviceMeteringScenario.ExportMeteringDeviceHistory();
//deviceMeteringScenario.ImportMeteringDeviceValues();

View File

@ -11,27 +11,27 @@ namespace Hcs.TestApp.Scenario
{
private readonly UniClient client = client;
internal void ImportPaymentDocument()
internal void ImportPaymentDocumentData()
{
var paymentInformation = new ImportPaymentDocumentPayload.PaymentInformation()
var paymentInformation = new ImportPaymentDocumentDataPayload.PaymentInformation()
{
bankBIK = "049805609",
operatingAccountNumber = "40602810276000100228"
};
var payload = new ImportPaymentDocumentPayload()
var payload = new ImportPaymentDocumentDataPayload()
{
confirmAmountsCorrect = true,
month = 8,
year = 2025,
paymentInformation = [paymentInformation],
paymentDocument = [new ImportPaymentDocumentPayload.PaymentDocument()
paymentDocument = [new ImportPaymentDocumentDataPayload.PaymentDocument()
{
paymentInformation = paymentInformation,
accountGuid = "019917a8-6eb6-74cc-99b7-58350127ac50",
paymentDocumentNumber = "23900701600162023",
chargeInfo =
[
new ImportPaymentDocumentPayload.MunicipalService()
new ImportPaymentDocumentDataPayload.MunicipalService()
{
moneyRecalculation = 0M,
moneyDiscount = 0M,
@ -63,7 +63,7 @@ namespace Hcs.TestApp.Scenario
}]
};
var result = client.Bills.ImportPaymentDocumentAsync(payload).Result;
var result = client.Bills.ImportPaymentDocumentDataAsync(payload).Result;
Console.WriteLine("Scenario execution " + (result ? "succeeded" : "failed"));
}
}