diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/ImdgQueryService.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/ImdgQueryService.java index 76aed74df..ff9f839f2 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/ImdgQueryService.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/ImdgQueryService.java @@ -200,7 +200,8 @@ public class ImdgQueryService { public BigDecimal defineTransferRate(Long currencyPairDictionaryId, String securitySymbol) { ImdgPredicateBuilder pb = riskParameterImdg.predicateBuilder(); - String baseCurrency = "RUB".equals(securitySymbol) ? "CNY" : securitySymbol; + boolean isRub = "RUB".equals(securitySymbol); + String baseCurrency = isRub ? "CNY" : securitySymbol; RiskParameter riskParameter = riskParameterImdg.getSingleObjectByPredicate( pb.and( @@ -208,7 +209,7 @@ public class ImdgQueryService { pb.equals("currencyPairId", currencyPairDictionaryId) ) ); - return riskParameter.getQuoteValue(); + return isRub ? riskParameter.getValue() : riskParameter.getQuoteValue(); } public CurrencyPairDictionary getCurrencyPairDictionaryBySecurityId(Long securityId) {