treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '10_01_2024_hotfix' into dev

Browse source
This commit is contained in:
ialbert 2024-01-12 11:39:27 +03:00
commit e605897cc1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderV2.java
View file

@ -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) {