diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/ValidationConfig.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/ValidationConfig.java index 8a2dd7581..e5ecd93ba 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/ValidationConfig.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/ValidationConfig.java @@ -381,7 +381,7 @@ public class ValidationConfig { companyPresentRule, tcrPresent, QuantityLotGreaterThanZero.INSTANCE, - OrderCurrencyByCompanyAndTcrAlreadyPresent.getInstance(OrderCompanyUpdateRequest.class), + //OrderCurrencyByCompanyAndTcrAlreadyPresent.getInstance(OrderCompanyUpdateRequest.class), OrderCurrencyPLBLCheck.INSTANCE, counterOrderPresent); }; diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/OrderCurrencyListener.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/OrderCurrencyListener.java index 59b707779..be7acc8a0 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/OrderCurrencyListener.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/OrderCurrencyListener.java @@ -287,6 +287,7 @@ public class OrderCurrencyListener extends QueueConsumer implements Initializing primaryOrder.setAccount(tcr.getCode()); primaryOrder.setTradingCode(company.getTradingCode()); primaryOrder.setQuantityLot(new BigDecimal(payload.getQuantityLot())); + primaryOrder.setSide(oc.getSide()); primaryOrder.setCreated(now); OrderCurrency counterOrder = new OrderCurrency(); @@ -304,6 +305,15 @@ public class OrderCurrencyListener extends QueueConsumer implements Initializing } counterOrder.setCreated(now); + Pair.forEach(new Pair<>(primaryOrder, counterOrder), o -> { + o.setSecurityId(oc.getSecurityId()); + o.setSecuritySymbol(oc.getSecuritySymbol()); + o.setOvernightType(oc.getOvernightType()); + o.setListingId(oc.getListingId()); + o.setMarket(oc.getMarket()); + o.setPrice(oc.getPrice()); + o.setSettleCode(oc.getSettleCode()); + }); orderCurrencyImdg.insert(primaryOrder); orderCurrencyImdg.insert(counterOrder); return null;