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

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

Browse source
This commit is contained in:
akulikov 2024-12-09 17:32:10 +03:00
parent 88a45e7361
commit 95fd3012ec
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -246,6 +246,7 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder<EmptyParams, KS
BigDecimal quantity = quantities.get(rate.getCurrencyId()); BigDecimal quantity = quantities.get(rate.getCurrencyId());
BigDecimal freeQuantity; BigDecimal freeQuantity;
boolean freeQuantityIsDelta = false;
if (quantity.compareTo(BigDecimal.ZERO) <= 0 || NPR.compareTo(BigDecimal.ZERO) < 0) { if (quantity.compareTo(BigDecimal.ZERO) <= 0 || NPR.compareTo(BigDecimal.ZERO) < 0) {
freeQuantity = BigDecimal.ZERO; freeQuantity = BigDecimal.ZERO;
} else { } else {
@ -268,6 +269,7 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder<EmptyParams, KS
BigDecimal delta = posMoney.subtract(minPos.divide(rate.getValue(), RoundingMode.HALF_UP)); BigDecimal delta = posMoney.subtract(minPos.divide(rate.getValue(), RoundingMode.HALF_UP));
if (delta.compareTo(BigDecimal.ZERO) >= 0 && delta.compareTo(quantity) <= 0) { if (delta.compareTo(BigDecimal.ZERO) >= 0 && delta.compareTo(quantity) <= 0) {
freeQuantityIsDelta = true;
freeQuantity = delta; freeQuantity = delta;
} else if (delta.compareTo(BigDecimal.ZERO) < 0 || delta.compareTo(quantity) > 0) { } else if (delta.compareTo(BigDecimal.ZERO) < 0 || delta.compareTo(quantity) > 0) {
freeQuantity = quantity; freeQuantity = quantity;
@ -279,7 +281,7 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder<EmptyParams, KS
row.setFreeQuantity(freeQuantity); row.setFreeQuantity(freeQuantity);
log.debug("tkr = {}: Quantity[{}] = {}", tkr, rate.getCurrency(), quantity); log.debug("tkr = {}: Quantity[{}] = {}", tkr, rate.getCurrency(), quantity);
log.debug("tkr = {}: FreeQuantity (delta) [{}] = {}", tkr, rate.getCurrency(), freeQuantity); log.debug("tkr = {}: FreeQuantity (from {}) [{}] = {}", tkr, freeQuantityIsDelta ? "delta" : "quantity", rate.getCurrency(), freeQuantity);
log.debug("tkr = {}: LockQuantity [{}] = {}", tkr, rate.getCurrency(), lockQuantity); log.debug("tkr = {}: LockQuantity [{}] = {}", tkr, rate.getCurrency(), lockQuantity);
lockValue = lockValue.add(lockQuantity.multiply(rate.getValue())); lockValue = lockValue.add(lockQuantity.multiply(rate.getValue()));