diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryService.java index 70a044655..1c799934f 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryService.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryService.java @@ -53,8 +53,10 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.function.Function; +import java.util.function.Supplier; import java.util.stream.Stream; +import static ru.spcex.clearing.session.stage.impl.GatewayRequester.mapError; import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD; @Service @@ -287,24 +289,24 @@ public class RegistryService { return reqHelp.error(req.getId(), err.get()); } Registry rgs = validator.getStored(Stored.PresentById); - //Supplier gtwBuilder = () -> GatewayRequestCreator.from(rgs, InOutDirection.in); - //Optional gatewayOk; - //if (trdTime.isTradingTime()) { - // gatewayOk = gateway.gatewayRequestAndWait(gtwBuilder); - //} else { - // log.debug("RegistryChangeStatusExtractRequest rgs.id={} not sending gateway request", rgs.getId()); - // gatewayOk = Optional.of(true); - //} - //if (gatewayOk.isEmpty() || !gatewayOk.get()) { - // String gtwErr = msgResolver.resolve(mapError(gatewayOk)); - // log.error("{}.id={} {}", - // rgs.getRegistryCode(), - // rgs.getId(), - // gtwErr); - // notification.sendNotification(ObjectType.rgst, - // "Отметка о получении выписки: %s".formatted(gtwErr), - // Priority.HIGH); - //} + Supplier gtwBuilder = () -> GatewayRequestCreator.from(rgs, InOutDirection.in); + Optional gatewayOk; + if (trdTime.isTradingTime()) { + gatewayOk = gateway.gatewayRequestAndWait(gtwBuilder); + } else { + log.debug("RegistryChangeStatusExtractRequest rgs.id={} not sending gateway request", rgs.getId()); + gatewayOk = Optional.of(true); + } + if (gatewayOk.isEmpty() || !gatewayOk.get()) { + String gtwErr = msgResolver.resolve(mapError(gatewayOk)); + log.error("{}.id={} {}", + rgs.getRegistryCode(), + rgs.getId(), + gtwErr); + notification.sendNotification(ObjectType.rgst, + "Отметка о получении выписки: %s".formatted(gtwErr), + Priority.HIGH); + } rgs.setRegistryStatus(payload.getRegistryStatus()); log.debug("changing registry.id={} status to {}", rgs.getId(), payload.getRegistryStatus()); registryImdg.update(rgs);