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 bc06ddb64..a8513210c 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 @@ -109,6 +109,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea account.setStatus(req.getStatus()); } account.setCompanyId(req.getCompanyId()); + account.setCurrency(req.getCurrency()); account.setCreated(now); account.setUpdated(now); requestInfoUpdate = accountService.fillAccountFromRelation(account, userRequest.getId(), false); @@ -178,6 +179,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea Account account = accountMap.getSingleObjectByID(bankAccount.getAccountId()); account.setAccount(req.account); + account.setCurrency(req.getCurrency()); account.setUpdated(Instant.now()); ImdgTransaction imdgTransaction = imdgProvider.newTransaction(); 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 102b021a2..a19dd8b49 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 @@ -395,6 +395,7 @@ public class BankAccountServiceTest { account.setAccountType(AccountType.Bank.getKey()); account.setStatus(Status.Active.getKey()); account.setProcessingSign(Allowed.ALLOWED.getKey()); + account.setCurrency(currency); return account; } @@ -418,6 +419,7 @@ public class BankAccountServiceTest { bankAccount.setDestination(destination); bankAccount.setTaxpayerIdentificationNumber(taxpayerIdentificationNumber); bankAccount.setTaxRegistrationReasonCode(taxRegistrationReasonCode); + bankAccount.setCurrency(currency); bankAccount.setSwiftCode(swiftCode); return bankAccount; } @@ -434,6 +436,7 @@ public class BankAccountServiceTest { bankAccountNewRequest.setTaxRegistrationReasonCode(bankAccount.getTaxRegistrationReasonCode()); bankAccountNewRequest.setAccount(bankAccount.getAccount()); bankAccountNewRequest.setCompanyId(bankAccount.getCompanyId()); + bankAccountNewRequest.setCurrency(bankAccount.getCurrency()); bankAccountNewRequest.setSwiftCode(bankAccount.getSwiftCode()); return bankAccountNewRequest; }