ialbert 2026-04-17 16:24:40 +03:00
parent 8d1797eb4b
commit b328c137f6

View file

@ -19,10 +19,10 @@ import ru.clearing.classes.statics.data.misc.Listing;
import ru.clearing.classes.statics.data.misc.Market;
import ru.clearing.classes.statics.data.misc.OrderCurrency;
import ru.clearing.classes.statics.data.misc.OvernightSettings;
import ru.clearing.classes.statics.data.misc.SCrossRate;
import ru.clearing.classes.statics.data.misc.SOrders;
import ru.clearing.classes.statics.data.registry.Registry;
import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
import ru.clearing.classes.statics.data.security.Rates;
import ru.clearing.platform.dictionary.CurrencyPairDictionary;
import ru.spcex.clearing.dflt.management.component.validation.OrderCurrencyValidationStored;
import ru.spcex.clearing.dflt.management.config.ValidationConfig;
@ -192,7 +192,7 @@ public class OrderCurrencyListener extends QueueConsumer implements Initializing
Listing listing = imdgQueryService.findListing(rgs, market.getCode());
//мб возвращать вместе с листингом?
CurrencyPairDictionary currPair = imdgQueryService.getCurrencyPairDictionaryBySecurityId(listing.getSecurityId());
Rates rate = imdgQueryService.getRate(currPair.getBaseCurrency(), LocalDate.now());
SCrossRate rate = imdgQueryService.getSCrossRates(currPair.getBaseCurrency(), LocalDate.now());
var pair = new Pair<>(orderT0, orderT1);
Pair.forEach(pair, o -> {
@ -204,8 +204,8 @@ public class OrderCurrencyListener extends QueueConsumer implements Initializing
o.setMarket(MarketType.SCSP.getKey());
o.setCreated(Instant.now());
});
orderT0.setPrice(rate.getValue());
orderT1.setPrice(BigDecimalUtil.safeSumBD(swap.getPrice(), rate.getValue()));
orderT0.setPrice(rate.getUnitRate());
orderT1.setPrice(BigDecimalUtil.safeSumBD(swap.getPrice(), rate.getUnitRate()));
return pair;
}