From 8df2442aa6c887f818be8a96cc92a80c973ddffc Mon Sep 17 00:00:00 2001 From: ialbert Date: Wed, 10 Jan 2024 17:24:38 +0300 Subject: [PATCH 1/4] SDF06 DM*T.status condition OK/MNG => PROC/MNG --- .../clearing/service/validation/Sdf06NewValidationRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf06NewValidationRule.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf06NewValidationRule.java index 28b383e38..195ecd6f3 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf06NewValidationRule.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf06NewValidationRule.java @@ -131,7 +131,7 @@ public enum Sdf06NewValidationRule implements IValidationRule Date: Thu, 11 Jan 2024 14:29:59 +0300 Subject: [PATCH 2/4] http://jira.mfd.msk:8088/browse/CLS-311 --- .../payment/PaymentInstructionOutboundService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java index 8a7c120e5..2c6d9ddcd 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java @@ -125,12 +125,13 @@ public class PaymentInstructionOutboundService { log.debug("all checks passed, accCred.id={}, accDeb.id={}, addressee.id={}, sender.id={}, amount: {}", accCred.getId(), accDeb.getId(), addressee.getId(), sender.getId(), amount); - String purpose = tcr != null ? "Вывод средств по ТКР " + tcr.getCode() + " ." : "Вывод средств."; + String purpose = tcr != null ? "Возврат средств, свободных от обязательств с ТКР " + tcr.getCode() + " ." : "Вывод средств."; if (payload.getPaymentPurpose() != null) { - purpose += " " + payload.getPaymentPurpose(); - if (!(purpose.endsWith(".") || purpose.endsWith("!") || purpose.endsWith("?") || purpose.endsWith(";"))) { - purpose += "."; + String reqPmtPrpse = payload.getPaymentPurpose(); + if (!(reqPmtPrpse.endsWith(".") || reqPmtPrpse.endsWith("!") || reqPmtPrpse.endsWith("?") || reqPmtPrpse.endsWith(";"))) { + reqPmtPrpse += "."; } + purpose = reqPmtPrpse + " " + purpose; } PaymentInstruction pmt = PaymentInstructionBuilderV2.builder(imdgProvider) .registry(new Registry()) From b96fcaae7d16cbd21622c5e920936eee117b2d21 Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 11 Jan 2024 15:33:27 +0300 Subject: [PATCH 3/4] http://jira.mfd.msk:8088/browse/CLS-311 --- .../service/payment/PaymentInstructionOutboundService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java index 2c6d9ddcd..7a538920c 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java @@ -125,7 +125,7 @@ public class PaymentInstructionOutboundService { log.debug("all checks passed, accCred.id={}, accDeb.id={}, addressee.id={}, sender.id={}, amount: {}", accCred.getId(), accDeb.getId(), addressee.getId(), sender.getId(), amount); - String purpose = tcr != null ? "Возврат средств, свободных от обязательств с ТКР " + tcr.getCode() + " ." : "Вывод средств."; + String purpose = tcr != null ? "Возврат денежных средств, свободных от обязательств с ТКР " + tcr.getCode() + " ." : "Вывод средств."; if (payload.getPaymentPurpose() != null) { String reqPmtPrpse = payload.getPaymentPurpose(); if (!(reqPmtPrpse.endsWith(".") || reqPmtPrpse.endsWith("!") || reqPmtPrpse.endsWith("?") || reqPmtPrpse.endsWith(";"))) { From 6590d63026c15cf2e8c0cc09af6fd28ac7713f03 Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 12 Jan 2024 11:20:41 +0300 Subject: [PATCH 4/4] =?UTF-8?q?cs=5Fblocked=20=D0=BF=D1=80=D0=B8=20=D1=81?= =?UTF-8?q?=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8=20PaymentInstruction?= =?UTF-8?q?:=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=B0=D1=82=D0=B5=D0=B3=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=B8=20I=20=D0=98=D0=9B=D0=98=20V?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/builder/PaymentInstructionBuilderV2.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 14f4c3792..636bdbb23 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 @@ -236,7 +236,7 @@ public class PaymentInstructionBuilderV2 { boolean hasCounterPartyInitiator = false; for (Registry claim : claims) { Long counterPartyId = claim.getCounterPartyId(); - if (categoryVInitiator(counterPartyId) && companyRoleODEPPresent(counterPartyId)) { + if (categoryIOrVInitiator(counterPartyId) && companyRoleODEPPresent(counterPartyId)) { hasCounterPartyInitiator = true; break; } @@ -244,11 +244,11 @@ public class PaymentInstructionBuilderV2 { return hasCounterPartyInitiator; } - public boolean categoryVInitiator(Long companyId) { + public boolean categoryIOrVInitiator(Long companyId) { ClearingMemberCategory category = clearingCategoryImdg.getFirstObjectByFieldValues( Map.of("companyId", companyId)); ClearingCategory ctg = IEnumKey.getEnumByKey(ClearingCategory.class, category.getClearingMemberCategory()); - return ctg != null && ctg.equals(ClearingCategory.V); + return ctg != null && (ctg.equals(ClearingCategory.V) || ctg.equals(ClearingCategory.I)) ; } public boolean companyRoleODEPPresent(Long companyId) {