From 5660cd67b75b612d4dd8e7eed6e41cafb46a191f Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Tue, 12 May 2026 18:12:12 +0300 Subject: [PATCH 1/2] http://jira.mfd.msk:8088/browse/CLS-1007 --- .../dflt/management/service/OrderCalculationService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderCalculationService.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderCalculationService.java index 11ac7ba71..37c68b8f1 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderCalculationService.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderCalculationService.java @@ -69,16 +69,17 @@ public class OrderCalculationService { ? calculationRubSums(registry, listing.getLotSize().intValue(), s, n) : calculationSums(registry, listing.getLotSize().intValue(), s, n); - SCrossRate rates = imdgQueryService.getSCrossRates(pair.getBaseCurrency(), LocalDate.now()); + long nextWorkDayDelta = n.longValue(); + Rates rates = imdgQueryService.getRate(pair.getBaseCurrency(), LocalDate.now().plusDays(nextWorkDayDelta)); BigDecimal quantityLot; BigDecimal price; if (SettleCode.T0 == settleCode) { quantityLot = result.sum3().abs(); - price = rates.getUnitRate().setScale(listing.getPrecision().intValue(), RoundingMode.HALF_UP); + price = rates.getValue().setScale(listing.getPrecision().intValue(), RoundingMode.HALF_UP); } else { quantityLot = result.sum5().abs(); BigDecimal delta = swapPriceCalcT1(pair.getBaseCurrency(), s, n, listing.getPrecision().intValue()); - price = rates.getUnitRate().add(delta).setScale(listing.getPrecision().intValue(), RoundingMode.HALF_UP);; + price = rates.getValue().add(delta).setScale(listing.getPrecision().intValue(), RoundingMode.HALF_UP);; } return new FinalCalculationResult(price, s, quantityLot, result); From 686f2b1d39a92fabb42930341eb20aa8366db3da Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Tue, 12 May 2026 18:24:10 +0300 Subject: [PATCH 2/2] http://jira.mfd.msk:8088/browse/CLS-1004 --- .../src/main/resources/meta/meta.json | 39 +++++++++++++++---- .../src/main/resources/meta/meta.xml | 21 ++++++---- 2 files changed, 44 insertions(+), 16 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 c001db0da..d94518b47 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.297.173", + "version": "3.24.298.174", "enums": { @@ -1586,7 +1586,7 @@ "name": "Справочник принадлежности заявок", - "class": "...", + "class": "ru.clearing.platform.dictionary.OrderAffilDictionary", "table": "order_affil_dictionary", @@ -1609,7 +1609,7 @@ "name": "Справочник статуса заявок", - "class": "...", + "class": "ru.clearing.platform.dictionary.OrderStatusDictionary", "table": "order_status_dictionary", @@ -1632,7 +1632,7 @@ "name": "Справочник типов сделок переноса", - "class": "...", + "class": "ru.clearing.platform.dictionary.OvernightTypeDictionary", "table": "overnight_type_dictionary", @@ -1650,6 +1650,29 @@ } ] } + , + "comment": { + + "name": "Справочник комментариев", + + "class": "ru.clearing.platform.dictionary.CommentDictionary", + + "table": "comment_dictionary", + + "fields": [ + {"code": "id", + "name": "Идентификатор записи","shortname": "ID","type": 1 + } + , + {"code": "code", + "name": "Код","shortname": "Код","type": 2,"length": 8 + } + , + {"code": "name", + "name": "Наименование","shortname": "Тип","type": 2,"length": 255 + } + ] + } } @@ -11730,11 +11753,11 @@ } , {"code": "createdAt", - "field": "created","type": 4,"webtype": "4","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true } , {"code": "updatedAt", - "field": "updated","type": 4,"webtype": "4","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Завершено","searchable": true,"sortable": true + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Завершено","searchable": true,"sortable": true } , {"code": "securityId", @@ -11810,7 +11833,7 @@ } , {"code": "comment", - "type": 2,"length": 255,"name": "Комментарий","shortname": "Комментарий","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Комментарий","shortname": "Комментарий","searchable": true,"sortable": true,"visible": true,"link": "comment","linkCode": "code" } , {"code": "registryId", @@ -11870,7 +11893,7 @@ } , {"code": "comment", - "type": 2,"length": 255,"name": "Комментарий","shortname": "Комментарий" + "type": 2,"length": 255,"name": "Комментарий","shortname": "Комментарий","link": "comment","linkCode": "code","required": true } ] } 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 894b0dcec..6b502aeb3 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 @@ - + @@ -349,21 +349,26 @@ - + - + - + + + + + + @@ -2723,8 +2728,8 @@ - - + + @@ -2743,7 +2748,7 @@ - + @@ -2758,7 +2763,7 @@ - +