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

account-service http://jira.mfd.msk:8088/browse/CLS-672 заполнение bankAccount.swiftCode

Browse source
This commit is contained in:
AKurakin 2024-05-14 12:06:49 +03:00
parent ea5a502a0f
commit dc4a252400
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java
View file

@ -136,6 +136,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
bankAccount.setAccount(req.getAccount()); bankAccount.setAccount(req.getAccount());
bankAccount.setCompanyId(req.getCompanyId()); bankAccount.setCompanyId(req.getCompanyId());
bankAccount.setAccountId(accountId); bankAccount.setAccountId(accountId);
bankAccount.setSwiftCode(req.getSwiftCode());
bankAccountId = bankAccountMap.insert(bankAccount); bankAccountId = bankAccountMap.insert(bankAccount);
txOk = true; txOk = true;
@ -173,6 +174,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
bankAccount.setTaxpayerIdentificationNumber(req.getTaxpayerIdentificationNumber()); bankAccount.setTaxpayerIdentificationNumber(req.getTaxpayerIdentificationNumber());
bankAccount.setTaxRegistrationReasonCode(req.getTaxRegistrationReasonCode()); bankAccount.setTaxRegistrationReasonCode(req.getTaxRegistrationReasonCode());
bankAccount.setAccount(req.getAccount()); bankAccount.setAccount(req.getAccount());
bankAccount.setSwiftCode(req.getSwiftCode());
Account account = accountMap.getSingleObjectByID(bankAccount.getAccountId()); Account account = accountMap.getSingleObjectByID(bankAccount.getAccountId());
account.setAccount(req.account); account.setAccount(req.account);

5
clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/BankAccountServiceTest.java
View file

@ -79,6 +79,7 @@ public class BankAccountServiceTest {
private static final String correspondentAccountName = "BIK OF TINKOFF"; private static final String correspondentAccountName = "BIK OF TINKOFF";
private static final String taxpayerIdentificationNumber = "848484848484"; private static final String taxpayerIdentificationNumber = "848484848484";
private static final String taxRegistrationReasonCode = "886886"; private static final String taxRegistrationReasonCode = "886886";
private static final String swiftCode = "SWIFT_code";
protected final Long addresseeIdNew = 2L; protected final Long addresseeIdNew = 2L;
protected final String deal = "111111111"; protected final String deal = "111111111";
private final String acc = "0123456789"; private final String acc = "0123456789";
@ -314,6 +315,7 @@ public class BankAccountServiceTest {
predictableUpdateBankAccount.setTaxpayerIdentificationNumber("65468461321"); predictableUpdateBankAccount.setTaxpayerIdentificationNumber("65468461321");
predictableUpdateBankAccount.setTaxRegistrationReasonCode("532137"); predictableUpdateBankAccount.setTaxRegistrationReasonCode("532137");
predictableUpdateBankAccount.setAccount(acc); predictableUpdateBankAccount.setAccount(acc);
predictableUpdateBankAccount.setSwiftCode("SWIFT_2");
predictableUpdateBankAccount.setId(ID); predictableUpdateBankAccount.setId(ID);
BankAccountUpdateRequest bankAccountUpdateRequest = new BankAccountUpdateRequest(); BankAccountUpdateRequest bankAccountUpdateRequest = new BankAccountUpdateRequest();
@ -327,6 +329,7 @@ public class BankAccountServiceTest {
bankAccountUpdateRequest.setTaxpayerIdentificationNumber(predictableUpdateBankAccount.getTaxpayerIdentificationNumber()); bankAccountUpdateRequest.setTaxpayerIdentificationNumber(predictableUpdateBankAccount.getTaxpayerIdentificationNumber());
bankAccountUpdateRequest.setTaxRegistrationReasonCode(predictableUpdateBankAccount.getTaxRegistrationReasonCode()); bankAccountUpdateRequest.setTaxRegistrationReasonCode(predictableUpdateBankAccount.getTaxRegistrationReasonCode());
bankAccountUpdateRequest.setAccount(predictableUpdateBankAccount.getAccount()); bankAccountUpdateRequest.setAccount(predictableUpdateBankAccount.getAccount());
bankAccountUpdateRequest.setSwiftCode(predictableUpdateBankAccount.getSwiftCode());
String jsonString = getJsonStringForUpdate(bankAccountUpdateRequest, ID); String jsonString = getJsonStringForUpdate(bankAccountUpdateRequest, ID);
@ -415,6 +418,7 @@ public class BankAccountServiceTest {
bankAccount.setDestination(destination); bankAccount.setDestination(destination);
bankAccount.setTaxpayerIdentificationNumber(taxpayerIdentificationNumber); bankAccount.setTaxpayerIdentificationNumber(taxpayerIdentificationNumber);
bankAccount.setTaxRegistrationReasonCode(taxRegistrationReasonCode); bankAccount.setTaxRegistrationReasonCode(taxRegistrationReasonCode);
bankAccount.setSwiftCode(swiftCode);
return bankAccount; return bankAccount;
} }
@ -430,6 +434,7 @@ public class BankAccountServiceTest {
bankAccountNewRequest.setTaxRegistrationReasonCode(bankAccount.getTaxRegistrationReasonCode()); bankAccountNewRequest.setTaxRegistrationReasonCode(bankAccount.getTaxRegistrationReasonCode());
bankAccountNewRequest.setAccount(bankAccount.getAccount()); bankAccountNewRequest.setAccount(bankAccount.getAccount());
bankAccountNewRequest.setCompanyId(bankAccount.getCompanyId()); bankAccountNewRequest.setCompanyId(bankAccount.getCompanyId());
bankAccountNewRequest.setSwiftCode(bankAccount.getSwiftCode());
return bankAccountNewRequest; return bankAccountNewRequest;
} }