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 338469716..b866d66ba 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.26.301.177",
+ "version": "3.26.301.178",
"enums": {
@@ -4218,7 +4218,7 @@
"name": "Добавление кода клиента",
- "confirmation": "companyId,code,tradingClearingRegistryId,moneyAccountId,depoAccountId,status",
+ "confirmation": "companyId,code,tradingClearingRegistryId,status",
"class": "ru.spcex.clearing.backendapi.controller.request.cud.account.ClientCodeNewAction",
@@ -4245,7 +4245,7 @@
"name": "Изменение кода клиента",
- "confirmation": "companyId,code,tradingClearingRegistryId,moneyAccountId,depoAccountId,status",
+ "confirmation": "companyId,code,tradingClearingRegistryId,status",
"class": "ru.spcex.clearing.backendapi.controller.request.cud.account.ClientCodeUpdateAction",
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 effddceb5..827094134 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 @@
-
+
@@ -975,13 +975,13 @@
-
+
-
+
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 f006d6886..267eb6e38 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
@@ -11,6 +11,7 @@ import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.commons.lang3.StringUtils;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.producer.Producer;
import org.slf4j.Logger;
@@ -442,7 +443,9 @@ public class OrderCurrencyListener extends QueueConsumer implements Initializing
continue;
}
orderCurrency.setStatus(status.getKey());
- orderCurrency.setExchangeOrderId(normalize(sOrder.getExchangeOrderNum()));
+ if (orderCurrency.getExchangeOrderId() == null) {
+ orderCurrency.setExchangeOrderId(normalize(sOrder.getExchangeOrderNum()));
+ }
orderCurrency.setUpdated(Instant.now());
orderCurrencyImdg.update(orderCurrency);
} catch (Exception e) {
@@ -464,7 +467,9 @@ public class OrderCurrencyListener extends QueueConsumer implements Initializing
continue;
}
orderCurrency.setStatus(status.getKey());
- orderCurrency.setExchangeOrderId(normalize(sOrder.getExchangeOrderNum()));
+ if (orderCurrency.getExchangeOrderId() == null) {
+ orderCurrency.setExchangeOrderId(normalize(sOrder.getExchangeOrderNum()));
+ }
orderCurrency.setUpdated(Instant.now());
orderCurrencyImdg.update(orderCurrency);
} catch (Exception e) {
@@ -497,12 +502,15 @@ public class OrderCurrencyListener extends QueueConsumer implements Initializing
}
private Long normalize(String value) {
+ if (StringUtils.isEmpty(value) || value.equals("0")){
+ return 0L;
+ }
String[] parts = value.split("-", 3);
if (parts.length != 3) {
throw new IllegalArgumentException("Ожидается формат: digits-text-digits");
}
- String digits = parts[1] + parts[2];
+ String digits = parts[0] + parts[2];
return Long.valueOf(digits);
}
}