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

http://jira.mfd.msk:8088/browse/CLS-877

Browse source
This commit is contained in:
Aleksey Kulikov 2025-07-01 13:17:09 +03:00
parent 193983bc13
commit d707d6ab6e
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
View file

@ -175,7 +175,7 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
)
);
if (!executionDeposits.isEmpty()) {
if (executionDeposits.size() > 1) log.warn("ExecutionDeposit[exchangeExecutionId = {}].size > 1, use first", registry.getGroupId());
if (executionDeposits.size() > 1) log.warn("ExecutionDeposit[exchangeExecutionId = {}, market = {}].size > 1, use first", registry.getGroupId(), registry.getMarket());
ExecutionDeposit executionDeposit = executionDeposits.iterator().next();
classCode = executionDeposit.getMarket();
}
@ -201,7 +201,10 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
Registry tmtRegistry = registryImdg.getFirstObjectByPredicate(
pb.and(
pb.equals("counterPartyId", registry.getCompanyId()),
pb.equals("groupId", registry.getGroupId()),
pb.and(
pb.equals("groupId", registry.getGroupId()),
pb.equals("market", registry.getMarket())
),
tmtPredicate
)
);

10
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/db_direct/DBPredicateBuilder.java
View file

@ -135,6 +135,16 @@ public class DBPredicateBuilder extends ImdgPredicateBuilderHazelcast {
);
}
@Override
public ImdgPredicate alwaysTrue() {
return new DBPredicate(" (true) ");
}
@Override
public ImdgPredicate alwaysFalse() {
return new DBPredicate(" (false) ");
}
@Override
public ImdgPredicate sql(String sql) {
return new DBPredicate(sql);

1
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/db_direct/DBProvider.java
View file

@ -204,6 +204,7 @@ public class DBProvider implements ImdgProvider {
registryMatcher.put("sessionId", "session_id");
registryMatcher.put("sessionType", "session_type");
registryMatcher.put("paymentId", "payment_id");
registryMatcher.put("market", "market");
this.fieldsMatcherForTable.put(Registry.class, registryMatcher);
Map<String, String> sessionMatcher = new HashMap<>();