From e32c756c3052fa473dc51362399f9a316854572e Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Thu, 30 Apr 2026 15:15:04 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-958 // http://jira.mfd.msk:8088/browse/CLS-952 --- .../backend-api/src/main/resources/meta/meta.json | 13 +------------ .../backend-api/src/main/resources/meta/meta.xml | 4 +--- .../db-scripts/src/main/resources/db/DDL.sql | 2 +- .../management/listener/OrderCurrencyListener.java | 5 +++-- .../ru/spcex/clearing/fix/quickfix/Application.java | 4 +++- 5 files changed, 9 insertions(+), 19 deletions(-) diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json index 5ed265db6..ec7bc9cc8 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -1,6 +1,6 @@ { - "version": "3.23.295.168", + "version": "3.23.295.169", "enums": { @@ -6389,17 +6389,6 @@ "name": "Отправка заявок в Торговую систему", - "fields": [] - } - , - {"method":"post", - - "destination": "ORST", - - "group": "Обмен с Торговой системой", - - "name": "Получение статуса заявок из Торговой системы", - "fields": [] } ] diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml index fbc0ce044..1742d743f 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1,6 +1,6 @@ - + @@ -1478,8 +1478,6 @@ - - diff --git a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql index 09ea748a4..a970ebed4 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -5758,4 +5758,4 @@ GRANT ALL PRIVILEGES ON TABLE S_ORDERS TO clearing; -- Data types -INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.22') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION \ No newline at end of file +INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.23') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VE RSION \ No newline at end of file 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 78d1ee01a..6862a3e59 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 @@ -393,8 +393,8 @@ public class OrderCurrencyListener extends QueueConsumer implements Initializing OrderCurrency counterOrder = validator.getStored(OrderCurrencyValidationStored.CounterOrderCurrency); log.info("deleting OrderCurrency[{}, {}]", order.getId(), counterOrder.getId()); - orderCurrencyImdg.delete(order); - orderCurrencyImdg.delete(counterOrder); + reject(order); + reject(counterOrder); return null; } @@ -419,6 +419,7 @@ public class OrderCurrencyListener extends QueueConsumer implements Initializing private void updateByFix(BaseRequest req) { OrderCurrencyStatusUpdateRequest payload = req.getRequestPayload(); for (Long orderId : payload.getIds()) { + log.debug("Process updating status by orderNum {}", orderId); SOrders sOrder = sOrdersImdg.getSingleObjectByPredicate( sOrdersImdg.predicateBuilder().equals("orderNum", orderId) ); diff --git a/clearing-parent/fix-service/src/main/java/ru/spcex/clearing/fix/quickfix/Application.java b/clearing-parent/fix-service/src/main/java/ru/spcex/clearing/fix/quickfix/Application.java index bc01e09d6..84f036ad1 100644 --- a/clearing-parent/fix-service/src/main/java/ru/spcex/clearing/fix/quickfix/Application.java +++ b/clearing-parent/fix-service/src/main/java/ru/spcex/clearing/fix/quickfix/Application.java @@ -1,6 +1,7 @@ package ru.spcex.clearing.fix.quickfix; import java.math.BigDecimal; +import java.time.Instant; import java.time.ZoneOffset; import java.util.regex.Pattern; import org.slf4j.Logger; @@ -186,7 +187,7 @@ public class Application extends MessageCracker implements quickfix.Application, } else if (ordStatus.valueEquals(OrdStatus.CANCELED)) { sOrders.setWithdrawDateTime(transactTime.getValue().toInstant(ZoneOffset.UTC)); } - + sOrders.setCreated(Instant.now()); sOrdersImdg.insert(sOrders); } else { sOrders.setState(String.valueOf(ordStatus.getValue())); @@ -196,6 +197,7 @@ public class Application extends MessageCracker implements quickfix.Application, sOrders.setWithdrawDateTime(transactTime.getValue().toInstant(ZoneOffset.UTC)); } + sOrders.setUpdated(Instant.now()); sOrdersImdg.update(sOrders); }