treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-311

Browse source
This commit is contained in:
ialbert 2023-10-10 16:03:02 +03:00
parent 391384fab2
commit dc3ea5d48a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java
View file

@ -433,13 +433,13 @@ public class ValidationConfig {
IMDGDistributedNames.Map_Company, IMDGDistributedNames.Map_Company,
Company.class, Company.class,
ClearingError.RequiredFieldEmpty, ClearingError.RequiredFieldEmpty,
ClearingError.DictionaryNotFound), ClearingError.WrongField),
IdPresentRule.instance("addresseeId", IdPresentRule.instance("addresseeId",
PIClearingOutbondActionNewRequest::getAddresseeId, PIClearingOutbondActionNewRequest::getAddresseeId,
IMDGDistributedNames.Map_Company, IMDGDistributedNames.Map_Company,
Company.class, Company.class,
ClearingError.RequiredFieldEmpty, ClearingError.RequiredFieldEmpty,
ClearingError.DictionaryNotFound), ClearingError.WrongField),
PaymentOutboundValidationRule.CreditLegAccount, PaymentOutboundValidationRule.CreditLegAccount,
PaymentOutboundValidationRule.DebitLegAccount, PaymentOutboundValidationRule.DebitLegAccount,
PaymentOutboundValidationRule.AddresseePresent, PaymentOutboundValidationRule.AddresseePresent,

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java
View file

@ -144,7 +144,7 @@ public class PaymentInstructionOutboundService {
.build(); .build();
BankAccount bnkAcc = bnkAccImdg.getFirstObjectBySQL("accountId = %d".formatted(accDeb.getId())); BankAccount bnkAcc = bnkAccImdg.getFirstObjectBySQL("accountId = %d".formatted(accDeb.getId()));
if (bnkAcc != null) { if (bnkAcc != null) {
pmt.setAddresseeBankName(bnkAcc.getBankIdentificationCode()); pmt.setAddresseeBankName(bnkAcc.getBankName());
pmt.setDebit_csAccount(bnkAcc.getCorrespondentAccount()); pmt.setDebit_csAccount(bnkAcc.getCorrespondentAccount());
} }
Currency currency = currImdg.getFirstObjectBySQL("currencyCode = '%s'".formatted(CurrencyCode.RUB.getKey())); Currency currency = currImdg.getFirstObjectBySQL("currencyCode = '%s'".formatted(CurrencyCode.RUB.getKey()));