From a65ac4b9b683af1aed2ece9f3cf69654c6a09147 Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 3 May 2024 16:19:16 +0300 Subject: [PATCH] currency session registry creation bugfix currency_pair_security search all sessions 1st step changed sdf51 -> sdf56 --- .../spcex/clearing/session/stage/impl/BalanceRevise.java | 7 ++----- .../clearing/session/stage/impl/RegistryCurrBuilder.java | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/BalanceRevise.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/BalanceRevise.java index 5b0af7167..e8b96a180 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/BalanceRevise.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/BalanceRevise.java @@ -45,8 +45,8 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder; import ru.spcex.platform.imdg.api.predicate.specific.StatementRevisePredicate; import ru.spcex.platform.utils.enumeration.EnumMessage; -import ru.spcex.platform.utils.time.TimeUtil; import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD; +import ru.spcex.platform.utils.time.TimeUtil; @Service @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) @@ -77,10 +77,7 @@ public class BalanceRevise implements ISessionStage { @Override public StageResult submit(Task task) { switch (task.getTaskType()) { - case StartRevise -> { - return sendSdfs51(); - } - case FormingPaymentInstruction -> { + case StartRevise, FormingPaymentInstruction -> { LocalTime fromTime = null; if (task.getData() instanceof LocalTime) { fromTime = (LocalTime) task.getData(); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryCurrBuilder.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryCurrBuilder.java index 2e76d0750..1110d082d 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryCurrBuilder.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryCurrBuilder.java @@ -126,7 +126,7 @@ public class RegistryCurrBuilder implements IRegistryBuilder { //TM_T = RUB [quote_currency_id] balance=settlement_ammount reg.setContract(String.valueOf(exec.getSecurityId())); CurrencyPairSecurity curPairSec = currPairSecImdg.getFirstObjectBySQL( - "code = '%s'".formatted(exec.getSecuritySymbol()) //fixme or securityId = "" + "id = %d".formatted(exec.getSecurityId()) ); CurrencyPairDictionary curPairDict = null; if (curPairSec != null) {