diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderTemplateBuilder.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderTemplateBuilder.java index bbc744c44..3d341a054 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderTemplateBuilder.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderTemplateBuilder.java @@ -31,7 +31,7 @@ public class OrderTemplateBuilder { default -> throw new IllegalArgumentException("Unsupported order category: " + context.getOrderCategory()); } Side side = resolvePrimaryTransferSide(context.getRegistry(), settleCode); - enrichOrder(orderCurrency, context, side, "overnight", settleCode, finalCalculationResult); + enrichOrder(orderCurrency, context, side, settleCode, finalCalculationResult); return orderCurrency; } @@ -46,7 +46,7 @@ public class OrderTemplateBuilder { } ; Side side = resolveCounterTransferSide(context.getRegistry(), settleCode); - enrichOrder(orderCurrency, context, side, "overnight", settleCode, finalCalculationResult); + enrichOrder(orderCurrency, context, side, settleCode, finalCalculationResult); return orderCurrency; } @@ -61,7 +61,7 @@ public class OrderTemplateBuilder { } ; Side side = resolvePrimaryBalancingSide(context.getRegistry(), settleCode); - enrichOrder(orderCurrency, context, side, "balance", settleCode, finalCalculationResult); + enrichOrder(orderCurrency, context, side, settleCode, finalCalculationResult); return orderCurrency; } @@ -76,7 +76,7 @@ public class OrderTemplateBuilder { } ; Side side = resolveCounterBalancingSide(context.getRegistry(), settleCode); - enrichOrder(orderCurrency, context, side, "balance", settleCode, finalCalculationResult); + enrichOrder(orderCurrency, context, side, settleCode, finalCalculationResult); return orderCurrency; } @@ -91,6 +91,7 @@ public class OrderTemplateBuilder { order.setTradingCode(registry.getTradingCode()); order.setCounterPartyId(clcc.companyId()); order.setCounterTradingCode(clcc.tradingCode()); + order.setComment("Type=1"); order.setType("CMOV"); return order; } @@ -106,6 +107,7 @@ public class OrderTemplateBuilder { order.setTradingCode(clcc.tradingCode()); order.setCounterPartyId(registry.getCompanyId()); order.setCounterTradingCode(registry.getTradingCode()); + order.setComment("Type=1"); order.setType("CMOV"); return order; } @@ -121,6 +123,7 @@ public class OrderTemplateBuilder { order.setTradingCode(categoryP.tradingCode()); order.setCounterPartyId(clcc.companyId()); order.setCounterTradingCode(clcc.tradingCode()); + order.setComment("Type=1"); order.setType("CMBL"); return order; } @@ -136,6 +139,7 @@ public class OrderTemplateBuilder { order.setTradingCode(clcc.tradingCode()); order.setCounterPartyId(categoryP.companyId()); order.setCounterTradingCode(categoryP.tradingCode()); + order.setComment("Type=1"); order.setType("CMBL"); return order; } @@ -151,6 +155,7 @@ public class OrderTemplateBuilder { order.setTradingCode(registry.getTradingCode()); order.setCounterPartyId(clcc.companyId()); order.setCounterTradingCode(clcc.tradingCode()); + order.setComment("Type=3"); order.setType("PLOV"); return order; } @@ -166,6 +171,7 @@ public class OrderTemplateBuilder { order.setTradingCode(clcc.tradingCode()); order.setCounterPartyId(registry.getCompanyId()); order.setCounterTradingCode(registry.getTradingCode()); + order.setComment("Type=3"); order.setType("PLOV"); return order; } @@ -181,6 +187,7 @@ public class OrderTemplateBuilder { order.setTradingCode(rgcm.tradingCode()); order.setCounterPartyId(clcc.companyId()); order.setCounterTradingCode(clcc.tradingCode()); + order.setComment("Type=3"); order.setType("PLBL"); return order; } @@ -196,6 +203,7 @@ public class OrderTemplateBuilder { order.setTradingCode(clcc.tradingCode()); order.setCounterPartyId(rgcm.companyId()); order.setCounterTradingCode(rgcm.tradingCode()); + order.setComment("Type=3"); order.setType("PLBL"); return order; } @@ -203,7 +211,6 @@ public class OrderTemplateBuilder { public void enrichOrder(OrderCurrency order, OrderCurrencyContext context, Side side, - String comment, SettleCode settleCode, FinalCalculationResult finalCalculationResult) { Registry registry = context.getRegistry(); @@ -219,7 +226,6 @@ public class OrderTemplateBuilder { order.setSide(side.getKey()); order.setSettleCode(settleCode.getKey()); order.setStatus("CRET"); - order.setComment(comment); order.setRegistryId(registry.getId()); order.setCreated(Instant.now());