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

http://jira.mfd.msk:8088/browse/CLS-888 округление в нотификации о разнице на шаге 5

Browse source
This commit is contained in:
ialbert 2025-07-22 11:26:03 +03:00
parent 6eef004c50
commit dc8a07b143
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/util/ClearingUtil.java
View file

@ -1,6 +1,7 @@
package ru.spcex.clearing.util; package ru.spcex.clearing.util;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Map; import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import ru.clearing.classes.statics.data.execution.ExecutionCommon; import ru.clearing.classes.statics.data.execution.ExecutionCommon;
@ -32,7 +33,8 @@ public class ClearingUtil {
if (asset == null) return biErr(obligation); if (asset == null) return biErr(obligation);
BigDecimal difference = safeBD(obligation.getBalance()) BigDecimal difference = safeBD(obligation.getBalance())
.subtract(asset.getBalance()) .subtract(asset.getBalance())
.abs(); .abs()
.setScale(2, RoundingMode.HALF_UP);
return "Недостаточно средств по инструменту " return "Недостаточно средств по инструменту "
+ obligation.getSecuritySymbol() + obligation.getSecuritySymbol()
+ ", разница: " + difference; + ", разница: " + difference;
@ -43,7 +45,9 @@ public class ClearingUtil {
+ obligation.getSecuritySymbol() + obligation.getSecuritySymbol()
+ ", разница: " + bd; + ", разница: " + bd;
BigDecimal obligationBalance = safeBD(obligation.getBalance()); BigDecimal obligationBalance = safeBD(obligation.getBalance());
Function<Registry, BigDecimal> diff = r -> obligationBalance.subtract(r.getBalance()).abs(); Function<Registry, BigDecimal> diff = r -> obligationBalance.subtract(r.getBalance())
.abs()
.setScale(2, RoundingMode.HALF_UP);
BigDecimal assetBalance1 = safeBD(asset1.getBalance()); BigDecimal assetBalance1 = safeBD(asset1.getBalance());
if (assetBalance1.compareTo(obligationBalance) < 0) { if (assetBalance1.compareTo(obligationBalance) < 0) {
return printErr.apply(diff.apply(asset1)); return printErr.apply(diff.apply(asset1));