From d8e519c83819fd67087bae7b2ed0b20969b42ec0 Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 8 Jun 2023 14:00:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=82=D0=BE=D0=B3=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=9C=D0=9A=D0=A0=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20PaymentInstruction=20=D0=BF=D0=BE=20=D1=81?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=BA=D0=B0=D0=BC=20bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ymentInstructionBuilderFinalMkrDeals.java} | 22 +++++++++---------- ...ormingPaymentInstructionDealsFinalMkr.java | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) rename clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/{PaymentInstructionBuilderFinalMkr.java => PaymentInstructionBuilderFinalMkrDeals.java} (92%) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkr.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkrDeals.java similarity index 92% rename from clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkr.java rename to clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkrDeals.java index 10aaae950..7a0974b97 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkr.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkrDeals.java @@ -25,8 +25,8 @@ import java.util.concurrent.atomic.AtomicLong; /** * Builder для кейса итоговой сессии МКР, 7 шаг, кейс - по сделкам */ -public class PaymentInstructionBuilderFinalMkr { - private final static Logger log = LoggerFactory.getLogger(PaymentInstructionBuilderFinalMkr.class); +public class PaymentInstructionBuilderFinalMkrDeals { + private final static Logger log = LoggerFactory.getLogger(PaymentInstructionBuilderFinalMkrDeals.class); private Registry cm_t; @@ -43,38 +43,38 @@ public class PaymentInstructionBuilderFinalMkr { protected AtomicLong documentNumberId = new AtomicLong(0L); // порядковый номер (сквозной по всем компаниям за день private static final DateTimeFormatter DATE_FORMATTER_ddMMyy = DateTimeFormatter.ofPattern("ddMMyy"); - public static PaymentInstructionBuilderFinalMkr builder(ImdgProvider imdgProvider) { - return new PaymentInstructionBuilderFinalMkr(imdgProvider); + public static PaymentInstructionBuilderFinalMkrDeals builder(ImdgProvider imdgProvider) { + return new PaymentInstructionBuilderFinalMkrDeals(imdgProvider); } - private PaymentInstructionBuilderFinalMkr(ImdgProvider imdgProvider) { + private PaymentInstructionBuilderFinalMkrDeals(ImdgProvider imdgProvider) { this.accountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class); this.companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); this.companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); this.securityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Security, Security.class); } - public PaymentInstructionBuilderFinalMkr lm_t(Registry lm_t) { + public PaymentInstructionBuilderFinalMkrDeals lm_t(Registry lm_t) { this.lm_t = lm_t; return this; } - public PaymentInstructionBuilderFinalMkr cm_t(Registry cm_t) { + public PaymentInstructionBuilderFinalMkrDeals cm_t(Registry cm_t) { this.cm_t = cm_t; return this; } - public PaymentInstructionBuilderFinalMkr tranAcc(Account account) { + public PaymentInstructionBuilderFinalMkrDeals tranAcc(Account account) { this.tranAccount = account; return this; } - public PaymentInstructionBuilderFinalMkr sessionId(Long sessionId) { + public PaymentInstructionBuilderFinalMkrDeals sessionId(Long sessionId) { this.sessionId = sessionId; return this; } - public PaymentInstructionBuilderFinalMkr amount(BigDecimal amount) { + public PaymentInstructionBuilderFinalMkrDeals amount(BigDecimal amount) { this.amount = amount; return this; } @@ -237,7 +237,7 @@ public class PaymentInstructionBuilderFinalMkr { Account account = accountImdg.getSingleObjectByFieldValues(Map.of( "companyId", companyId, "accountType", accountType.getKey(), - "accountStatus", accountStatus.getKey(), + "status", accountStatus.getKey(), "processingSign", processingSign.getKey() )); if (account == null) { diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionDealsFinalMkr.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionDealsFinalMkr.java index 0a12c68c0..5acf6ed4b 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionDealsFinalMkr.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionDealsFinalMkr.java @@ -18,7 +18,7 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.balance.ExportToFileRequest; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; -import ru.spcex.clearing.service.builder.PaymentInstructionBuilderFinalMkr; +import ru.spcex.clearing.service.builder.PaymentInstructionBuilderFinalMkrDeals; import ru.spcex.clearing.session.stage.ISessionStage; import ru.spcex.clearing.session.stage.StageResult; import ru.spcex.clearing.session.stage.Task; @@ -145,7 +145,7 @@ public class FormingPaymentInstructionDealsFinalMkr implements ISessionStage { groupId, rgsCmt.getId(), rgsLmt.getId()); - Pair pmtInstrs = PaymentInstructionBuilderFinalMkr + Pair pmtInstrs = PaymentInstructionBuilderFinalMkrDeals .builder(imdgProvider) .cm_t(rgsCmt) .lm_t(rgsLmt)