From 4b1b6113f4cbacb371eb0430b96c24a7ac6c8b24 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 21 Nov 2023 16:25:10 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-536 --- .../builder/PaymentInstructionBuilderV2.java | 2 +- .../service/executors/Sdf57Executor.java | 3 ++- .../platform/enumeration/SpecifFlag.java | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/SpecifFlag.java diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderV2.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderV2.java index bd9329402..7a4a5211f 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderV2.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderV2.java @@ -143,7 +143,7 @@ public class PaymentInstructionBuilderV2 { } if (useCS_BLKD && categoryVInitiator(senderId) && companyRoleODEPPresent(senderId)) { - payment.setPaymentPurpose("CS_BLKD " + purpose); + payment.setPaymentPurpose(SpecifFlag.CS_BLKD.getKey() + " " + purpose); } else { payment.setPaymentPurpose(purpose); } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java index 6756a54eb..c1638189a 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java @@ -361,7 +361,8 @@ public class Sdf57Executor extends AbstractExecutor { if (TextUtil.isEmpty(asts.a__t().getTradingClearingRegistry())) { log.trace("stmt.id={} {}.id={} TCR is empty, skipping gateway request", stmt.getId(), asts.a__t().getRegistryCode(), asts.a__t().getId()); - } else { + } else if (TextUtil.isEmpty(sdf57.getSpecif()) + || !sdf57.getSpecif().contains(SpecifFlag.CS_BLKD.getKey())) { log.trace("sending gateway request for stmt.id={}", stmt.getId()); kafka.sendRequestToQueue(Consts.ASSET_OPERATION, gatewayRequest(stmt, diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/SpecifFlag.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/SpecifFlag.java new file mode 100644 index 000000000..3a15df80e --- /dev/null +++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/SpecifFlag.java @@ -0,0 +1,19 @@ +package ru.spcex.platform.enumeration; + +import ru.spcex.platform.utils.enumeration.IEnumKey; + +public enum SpecifFlag implements IEnumKey { + CS_BLKD("CS_BLKD"), + ; + + private final String key; + + SpecifFlag(String key) { + this.key = key; + } + + @Override + public String getKey() { + return key; + } +}