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 53370a842..7138b4624 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 @@ -353,6 +353,10 @@ public class OrderCurrencyListener extends QueueConsumer implements Initializing for (Long orderId : payload.getIds()) { SOrders sOrder = sOrdersImdg.getSingleObjectByID(orderId); OrderCurrency orderCurrency = orderCurrencyImdg.getSingleObjectByID(orderId); + if (orderCurrency == null) { + log.warn("OrderCurrency[{}] not found", orderId); + continue; + } OrderStatus status = resolveStatusByImportState(sOrder.getState()); if (status == null) { continue; diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/TaskListener.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/TaskListener.java index efe2792a0..290276f65 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/TaskListener.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/TaskListener.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.time.LocalTime; +import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Collection; import java.util.Optional; @@ -119,7 +119,7 @@ public class TaskListener extends QueueConsumer implements InitializingBean { Collection orders = imdgQueryService.getClccOrderCurrencyIds(); String content = orderCurrencyTriExportService.exportToTri(orders); Path fileName = storagePath.resolve(String.format("KS_TS_ORDERS_%s.tri", - LocalTime.now().format(formatter))); + LocalDateTime.now().format(formatter))); Files.writeString(fileName, content, StandardCharsets.UTF_8); kafkaSender.sendRequestToQueue(Consts.SDOR_FIX_TASK, req.getRequestPayload()); } catch (IOException e) {