diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java index f473e7ab1..bc06ddb64 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java @@ -136,6 +136,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea bankAccount.setAccount(req.getAccount()); bankAccount.setCompanyId(req.getCompanyId()); bankAccount.setAccountId(accountId); + bankAccount.setSwiftCode(req.getSwiftCode()); bankAccountId = bankAccountMap.insert(bankAccount); txOk = true; @@ -173,6 +174,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea bankAccount.setTaxpayerIdentificationNumber(req.getTaxpayerIdentificationNumber()); bankAccount.setTaxRegistrationReasonCode(req.getTaxRegistrationReasonCode()); bankAccount.setAccount(req.getAccount()); + bankAccount.setSwiftCode(req.getSwiftCode()); Account account = accountMap.getSingleObjectByID(bankAccount.getAccountId()); account.setAccount(req.account); diff --git a/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/BankAccountServiceTest.java b/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/BankAccountServiceTest.java index 53e99fd29..102b021a2 100644 --- a/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/BankAccountServiceTest.java +++ b/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/BankAccountServiceTest.java @@ -79,6 +79,7 @@ public class BankAccountServiceTest { private static final String correspondentAccountName = "BIK OF TINKOFF"; private static final String taxpayerIdentificationNumber = "848484848484"; private static final String taxRegistrationReasonCode = "886886"; + private static final String swiftCode = "SWIFT_code"; protected final Long addresseeIdNew = 2L; protected final String deal = "111111111"; private final String acc = "0123456789"; @@ -314,6 +315,7 @@ public class BankAccountServiceTest { predictableUpdateBankAccount.setTaxpayerIdentificationNumber("65468461321"); predictableUpdateBankAccount.setTaxRegistrationReasonCode("532137"); predictableUpdateBankAccount.setAccount(acc); + predictableUpdateBankAccount.setSwiftCode("SWIFT_2"); predictableUpdateBankAccount.setId(ID); BankAccountUpdateRequest bankAccountUpdateRequest = new BankAccountUpdateRequest(); @@ -327,6 +329,7 @@ public class BankAccountServiceTest { bankAccountUpdateRequest.setTaxpayerIdentificationNumber(predictableUpdateBankAccount.getTaxpayerIdentificationNumber()); bankAccountUpdateRequest.setTaxRegistrationReasonCode(predictableUpdateBankAccount.getTaxRegistrationReasonCode()); bankAccountUpdateRequest.setAccount(predictableUpdateBankAccount.getAccount()); + bankAccountUpdateRequest.setSwiftCode(predictableUpdateBankAccount.getSwiftCode()); String jsonString = getJsonStringForUpdate(bankAccountUpdateRequest, ID); @@ -415,6 +418,7 @@ public class BankAccountServiceTest { bankAccount.setDestination(destination); bankAccount.setTaxpayerIdentificationNumber(taxpayerIdentificationNumber); bankAccount.setTaxRegistrationReasonCode(taxRegistrationReasonCode); + bankAccount.setSwiftCode(swiftCode); return bankAccount; } @@ -430,6 +434,7 @@ public class BankAccountServiceTest { bankAccountNewRequest.setTaxRegistrationReasonCode(bankAccount.getTaxRegistrationReasonCode()); bankAccountNewRequest.setAccount(bankAccount.getAccount()); bankAccountNewRequest.setCompanyId(bankAccount.getCompanyId()); + bankAccountNewRequest.setSwiftCode(bankAccount.getSwiftCode()); return bankAccountNewRequest; }