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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2024-05-15 16:04:03 +03:00
commit 22c6ca754c
5 changed files with 12 additions and 9 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

@ -109,6 +109,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
account.setStatus(req.getStatus()); account.setStatus(req.getStatus());
} }
account.setCompanyId(req.getCompanyId()); account.setCompanyId(req.getCompanyId());
account.setCurrency(req.getCurrency());
account.setCreated(now); account.setCreated(now);
account.setUpdated(now); account.setUpdated(now);
requestInfoUpdate = accountService.fillAccountFromRelation(account, userRequest.getId(), false); 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 account = accountMap.getSingleObjectByID(bankAccount.getAccountId());
account.setAccount(req.account); account.setAccount(req.account);
account.setCurrency(req.getCurrency());
account.setUpdated(Instant.now()); account.setUpdated(Instant.now());
ImdgTransaction imdgTransaction = imdgProvider.newTransaction(); ImdgTransaction imdgTransaction = imdgProvider.newTransaction();

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

@ -395,6 +395,7 @@ public class BankAccountServiceTest {
account.setAccountType(AccountType.Bank.getKey()); account.setAccountType(AccountType.Bank.getKey());
account.setStatus(Status.Active.getKey()); account.setStatus(Status.Active.getKey());
account.setProcessingSign(Allowed.ALLOWED.getKey()); account.setProcessingSign(Allowed.ALLOWED.getKey());
account.setCurrency(currency);
return account; return account;
} }
@ -418,6 +419,7 @@ public class BankAccountServiceTest {
bankAccount.setDestination(destination); bankAccount.setDestination(destination);
bankAccount.setTaxpayerIdentificationNumber(taxpayerIdentificationNumber); bankAccount.setTaxpayerIdentificationNumber(taxpayerIdentificationNumber);
bankAccount.setTaxRegistrationReasonCode(taxRegistrationReasonCode); bankAccount.setTaxRegistrationReasonCode(taxRegistrationReasonCode);
bankAccount.setCurrency(currency);
bankAccount.setSwiftCode(swiftCode); bankAccount.setSwiftCode(swiftCode);
return bankAccount; return bankAccount;
} }
@ -434,6 +436,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.setCurrency(bankAccount.getCurrency());
bankAccountNewRequest.setSwiftCode(bankAccount.getSwiftCode()); bankAccountNewRequest.setSwiftCode(bankAccount.getSwiftCode());
return bankAccountNewRequest; return bankAccountNewRequest;
} }

4
clearing-parent/backend-api/src/main/resources/meta/data.xml
View file

@ -452,7 +452,7 @@
<errorCode id="5023" code="ACNT" name="Счет %s уже используется."/> <errorCode id="5023" code="ACNT" name="Счет %s уже используется."/>
<errorCode id="5024" code="ACNT" name="Не указан номер счета."/> <errorCode id="5024" code="ACNT" name="Не указан номер счета."/>
<errorCode id="5025" code="ACNT" name="Необходимо указать ДЕПО счет."/> <errorCode id="5025" code="ACNT" name="Необходимо указать ДЕПО счет."/>
<errorCode id="5026" code="ACNT" name="Счет %S не валютный"/> <errorCode id="5026" code="ACNT" name="Счет %S не валютный."/>
<!-- error code for balance-service --> <!-- error code for balance-service -->
<errorCode id="5200" code="BLNC" name="Общая ошибка модуля balance-service."/> <errorCode id="5200" code="BLNC" name="Общая ошибка модуля balance-service."/>
<errorCode id="5210" code="BLNC" name="Клиринговая сессия неактивна."/> <errorCode id="5210" code="BLNC" name="Клиринговая сессия неактивна."/>
@ -507,7 +507,7 @@
<!-- error code for dbf-importer --> <!-- error code for dbf-importer -->
<errorCode id="5600" code="DBFI" name="Общая ошибка модуля dbf-importer."/> <errorCode id="5600" code="DBFI" name="Общая ошибка модуля dbf-importer."/>
<!-- error code for RgsError --> <!-- error code for RgsError -->
<errorCode id="5700" code="CLRN" name="При проверке обязательств во время сессии не найден регистр для хранения активов для инструмента"/> <errorCode id="5700" code="CLRN" name="При проверке обязательств во время сессии не найден регистр для хранения активов для инструмента."/>
<!-- error code for dbf-exporter --> <!-- error code for dbf-exporter -->
<errorCode id="5800" code="DBFE" name="Общая ошибка модуля dbf-exporter."/> <errorCode id="5800" code="DBFE" name="Общая ошибка модуля dbf-exporter."/>

6
clearing-parent/db-scripts/src/main/resources/db/DATA.sql
View file

@ -1,4 +1,4 @@
-- DB version: 3.11.0.86 -- DB version: 3.11.0.88
-- DATA version: 3.11.0.78 -- DATA version: 3.11.0.78
@ -880,7 +880,7 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5024, 'ACNT', 'Не у
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5025, 'ACNT', 'Необходимо указать ДЕПО счет.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5025, 'ACNT', 'Необходимо указать ДЕПО счет.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5026, 'ACNT', 'Счет %S не валютный') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5026, 'ACNT', 'Счет %S не валютный.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5200, 'BLNC', 'Общая ошибка модуля balance-service.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5200, 'BLNC', 'Общая ошибка модуля balance-service.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
@ -982,7 +982,7 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5435, 'CLRN', 'Све
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5600, 'DBFI', 'Общая ошибка модуля dbf-importer.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5600, 'DBFI', 'Общая ошибка модуля dbf-importer.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5700, 'CLRN', 'При проверке обязательств во время сессии не найден регистр для хранения активов для инструмента') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5700, 'CLRN', 'При проверке обязательств во время сессии не найден регистр для хранения активов для инструмента.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5800, 'DBFE', 'Общая ошибка модуля dbf-exporter.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5800, 'DBFE', 'Общая ошибка модуля dbf-exporter.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java
View file

@ -330,10 +330,8 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder<EmptyParams, KSRe
"securityId", executionCurrency.getSecurityId() "securityId", executionCurrency.getSecurityId()
)); ));
if (currencyPairSecurity != null) { if (currencyPairSecurity != null) {
CurrencyPairDictionary currencyPairDictionary = currencyPairDictionaryImdg.getSingleObjectByFieldValues( CurrencyPairDictionary currencyPairDictionary = currencyPairDictionaryImdg.getSingleObjectByID(
Map.of( currencyPairSecurity.getCurrencyPairId()
"baseCurrency", currencyPairSecurity.getCurrencyPairId()
)
); );
if (currencyPairDictionary != null) { if (currencyPairDictionary != null) {
ksRepTradesReport.setLotCurrency(currencyPairDictionary.getBaseCurrency()); ksRepTradesReport.setLotCurrency(currencyPairDictionary.getBaseCurrency());