From 824f2631571c51e43a3ae5abdf86a13108190d8f Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 27 Jun 2025 17:00:33 +0300 Subject: [PATCH] =?UTF-8?q?exchangeExecutionId=20=D0=BE=D0=B4=D0=B8=D0=BD?= =?UTF-8?q?=D0=B0=D0=BA=D0=BE=D0=B2=D1=8B=D0=B5,=20=D1=81=D0=BE=D1=80?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D1=81=D0=B4=D0=B5?= =?UTF-8?q?=D0=BB=D0=BE=D0=BA=20=D0=B2=20Unit=20=D1=81=D0=B5=D1=81=D1=81?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RequirementsAndObligationCreationCompound.java | 5 ++--- .../src/main/java/ru/spcex/clearing/util/ComparatorUtil.java | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreationCompound.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreationCompound.java index 02cc6ff1d..f333776cf 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreationCompound.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreationCompound.java @@ -19,8 +19,7 @@ import ru.spcex.clearing.session.stage.StageResult; import ru.spcex.clearing.session.stage.Task; import ru.spcex.clearing.session.stage.TaskType; import ru.spcex.clearing.session.stage.task.RequirementsAndObligationCreationCompoundPayload; -import static ru.spcex.clearing.util.ComparatorUtil.execIdComparator; -import static ru.spcex.clearing.util.ComparatorUtil.tradeTimeComparator; +import static ru.spcex.clearing.util.ComparatorUtil.*; import ru.spcex.platform.classes.base.interfaces.ExecutionType; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.utils.collection.Pair; @@ -65,7 +64,7 @@ public class RequirementsAndObligationCreationCompound extends RequirementsAndOb List executionCurrency = data.getExecutionsCurrency(); List executionDeposit = data.getExecutionsFinal(); Map newRgss = storageMap(executionFond, executionCurrency, executionDeposit); - Stream.of(executionFond, executionCurrency, executionDeposit).forEach(c -> c.sort(tradeTimeComparator.thenComparing(execIdComparator))); + Stream.of(executionFond, executionCurrency, executionDeposit).forEach(c -> c.sort(tradeTimeComparator.thenComparing(execIdComparator).thenComparing(execMarketComparator))); int efs = executionFond.size(); int eds = executionDeposit.size(); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/util/ComparatorUtil.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/util/ComparatorUtil.java index a681d542f..9655e5bc9 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/util/ComparatorUtil.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/util/ComparatorUtil.java @@ -10,4 +10,7 @@ public class ComparatorUtil { public static final Comparator execIdComparator = Comparator.comparing(ExecutionCommon::getExchangeExecutionId); + public static final Comparator execMarketComparator + = Comparator.comparing(ExecutionCommon::getMarket); + }