From 56e3507e2607b89dda7651ca5fb40b5a8d404160 Mon Sep 17 00:00:00 2001 From: etreshenkov Date: Mon, 5 Jun 2023 14:00:34 +0300 Subject: [PATCH] fix registry builders --- .../clearing/session/stage/impl/RegistryDepoBuilder.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryDepoBuilder.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryDepoBuilder.java index 0435e7905..fbd8dc2ce 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryDepoBuilder.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryDepoBuilder.java @@ -98,7 +98,7 @@ public class RegistryDepoBuilder implements IRegistryBuilder { boolean isTSelling = regDsgn.equals(RegistryDesignation.T) && side.isSell(); boolean isTBuying = regDsgn.equals(RegistryDesignation.T) && side.isBuy(); - if ((isOBuying || isTSelling) && !secondLeg || (isOSelling || isTBuying) && secondLeg) { + if ((isOSelling || isTBuying) && !secondLeg || (isOBuying || isTSelling) && secondLeg) { reg.setRegistryInstrumentType(RegistryInstrumentType.M.getKey()); reg.setBalanceDimension(BalanceDimension.MONY.getKey()); Currency currency = currencyImdg.getSingleObjectByFieldValues(Map.of("currencyCode", exec.getSettlementCurrency())); @@ -133,11 +133,11 @@ public class RegistryDepoBuilder implements IRegistryBuilder { reg.setSettledDebit((execDep).getFirstLegAmount()); } if (secondLeg) { - reg.setSettlementDate(execDep.getFirstLegSettlementDate()); - reg.setSettlementCode(execDep.getFirstLegSettlementCode()); - } else { reg.setSettlementDate(execDep.getSecondLegSettlementDate()); reg.setSettlementCode(execDep.getSecondLegSettlementCode()); + } else { + reg.setSettlementDate(execDep.getFirstLegSettlementDate()); + reg.setSettlementCode(execDep.getFirstLegSettlementCode()); } reg.setRefundDate(execDep.getSecondLegSettlementDate()); reg.setValueDate(execDep.getFirstLegSettlementDate());