From 6590d63026c15cf2e8c0cc09af6fd28ac7713f03 Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 12 Jan 2024 11:20:41 +0300 Subject: [PATCH] =?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) {