treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2026-04-30 16:03:28 +03:00
commit d593fefc80
5 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clearing-parent/backend-api/src/main/resources/meta/meta.json
View file

@ -1,6 +1,6 @@
{ {
"version": "3.23.295.168", "version": "3.23.295.169",
"enums": { "enums": {
@ -6389,17 +6389,6 @@
"name": "Отправка заявок в Торговую систему", "name": "Отправка заявок в Торговую систему",
"fields": []
}
,
{"method":"post",
"destination": "ORST",
"group": "Обмен с Торговой системой",
"name": "Получение статуса заявок из Торговой системы",
"fields": [] "fields": []
} }
] ]

4
clearing-parent/backend-api/src/main/resources/meta/meta.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?--> <!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
<meta version="3.23.295.168"> <meta version="3.23.295.169">
<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" --> <!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
<!--Здесь словари--> <!--Здесь словари-->
<enums> <enums>
@ -1478,8 +1478,6 @@
</post> </post>
<post destination="SDOR" group="Обмен с Торговой системой" name="Отправка заявок в Торговую систему"> <post destination="SDOR" group="Обмен с Торговой системой" name="Отправка заявок в Торговую систему">
</post> </post>
<post destination="ORST" group="Обмен с Торговой системой" name="Получение статуса заявок из Торговой системы">
</post>
</actions> </actions>
</launcher> </launcher>
<session name="Клиринговые сессии" destination="sessions" historyDestination="history" class="ru.clearing.classes.statics.data.misc.Session" logUpdates="true" table="session"> <session name="Клиринговые сессии" destination="sessions" historyDestination="history" class="ru.clearing.classes.statics.data.misc.Session" logUpdates="true" table="session">

2
clearing-parent/db-scripts/src/main/resources/db/DDL.sql
View file

@ -5758,4 +5758,4 @@ GRANT ALL PRIVILEGES ON TABLE S_ORDERS TO clearing;
-- Data types -- Data types
INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.22') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.23') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VE RSION

5
clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/OrderCurrencyListener.java
View file

@ -393,8 +393,8 @@ public class OrderCurrencyListener extends QueueConsumer implements Initializing
OrderCurrency counterOrder = validator.getStored(OrderCurrencyValidationStored.CounterOrderCurrency); OrderCurrency counterOrder = validator.getStored(OrderCurrencyValidationStored.CounterOrderCurrency);
log.info("deleting OrderCurrency[{}, {}]", order.getId(), counterOrder.getId()); log.info("deleting OrderCurrency[{}, {}]", order.getId(), counterOrder.getId());
orderCurrencyImdg.delete(order); reject(order);
orderCurrencyImdg.delete(counterOrder); reject(counterOrder);
return null; return null;
} }
@ -419,6 +419,7 @@ public class OrderCurrencyListener extends QueueConsumer implements Initializing
private void updateByFix(BaseRequest<OrderCurrencyStatusUpdateRequest> req) { private void updateByFix(BaseRequest<OrderCurrencyStatusUpdateRequest> req) {
OrderCurrencyStatusUpdateRequest payload = req.getRequestPayload(); OrderCurrencyStatusUpdateRequest payload = req.getRequestPayload();
for (Long orderId : payload.getIds()) { for (Long orderId : payload.getIds()) {
log.debug("Process updating status by orderNum {}", orderId);
SOrders sOrder = sOrdersImdg.getSingleObjectByPredicate( SOrders sOrder = sOrdersImdg.getSingleObjectByPredicate(
sOrdersImdg.predicateBuilder().equals("orderNum", orderId) sOrdersImdg.predicateBuilder().equals("orderNum", orderId)
); );

4
clearing-parent/fix-service/src/main/java/ru/spcex/clearing/fix/quickfix/Application.java
View file

@ -1,6 +1,7 @@
package ru.spcex.clearing.fix.quickfix; package ru.spcex.clearing.fix.quickfix;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.Instant;
import java.time.ZoneOffset; import java.time.ZoneOffset;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -186,7 +187,7 @@ public class Application extends MessageCracker implements quickfix.Application,
} else if (ordStatus.valueEquals(OrdStatus.CANCELED)) { } else if (ordStatus.valueEquals(OrdStatus.CANCELED)) {
sOrders.setWithdrawDateTime(transactTime.getValue().toInstant(ZoneOffset.UTC)); sOrders.setWithdrawDateTime(transactTime.getValue().toInstant(ZoneOffset.UTC));
} }
sOrders.setCreated(Instant.now());
sOrdersImdg.insert(sOrders); sOrdersImdg.insert(sOrders);
} else { } else {
sOrders.setState(String.valueOf(ordStatus.getValue())); 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.setWithdrawDateTime(transactTime.getValue().toInstant(ZoneOffset.UTC));
} }
sOrders.setUpdated(Instant.now());
sOrdersImdg.update(sOrders); sOrdersImdg.update(sOrders);
} }