From dc3ea5d48ab9915ce9107940fa1bf08d92070091 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 10 Oct 2023 16:03:02 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-311 --- .../main/java/ru/spcex/clearing/config/ValidationConfig.java | 4 ++-- .../service/payment/PaymentInstructionOutboundService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java index fd20f8b54..053250918 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java @@ -433,13 +433,13 @@ public class ValidationConfig { IMDGDistributedNames.Map_Company, Company.class, ClearingError.RequiredFieldEmpty, - ClearingError.DictionaryNotFound), + ClearingError.WrongField), IdPresentRule.instance("addresseeId", PIClearingOutbondActionNewRequest::getAddresseeId, IMDGDistributedNames.Map_Company, Company.class, ClearingError.RequiredFieldEmpty, - ClearingError.DictionaryNotFound), + ClearingError.WrongField), PaymentOutboundValidationRule.CreditLegAccount, PaymentOutboundValidationRule.DebitLegAccount, PaymentOutboundValidationRule.AddresseePresent, diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java index dfcf8f509..8a7c120e5 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java @@ -144,7 +144,7 @@ public class PaymentInstructionOutboundService { .build(); BankAccount bnkAcc = bnkAccImdg.getFirstObjectBySQL("accountId = %d".formatted(accDeb.getId())); if (bnkAcc != null) { - pmt.setAddresseeBankName(bnkAcc.getBankIdentificationCode()); + pmt.setAddresseeBankName(bnkAcc.getBankName()); pmt.setDebit_csAccount(bnkAcc.getCorrespondentAccount()); } Currency currency = currImdg.getFirstObjectBySQL("currencyCode = '%s'".formatted(CurrencyCode.RUB.getKey()));