From e4c8fc8278736da4839f0321f3e8e3d4e8753047 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Wed, 6 Sep 2023 11:46:52 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-497 some big decimal
 fixes

---
 .../ks/KSRepCashRegistersReportBuilder.java      | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegistersReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegistersReportBuilder.java
index bbe1d4592..104940a91 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegistersReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegistersReportBuilder.java
@@ -110,17 +110,13 @@ public class KSRepCashRegistersReportBuilder extends CSVReportBuilder<EmptyParam
                 RegistryCodeDictionary registryCodeDictionary = registryCodeDictionaryImdg.getFirstObjectByFieldValues(Map.of("code", registry.getRegistryCode()));
                 if (registryCodeDictionary != null) ksRepCashRegistersReport.setRegisterName(registryCodeDictionary.getName());
 
-                if (registry.getSettledCredit() != null) {
-                    if (registry.getSettledDebit() != null)
-                        ksRepCashRegistersReport.setChangeBalance(registry.getSettledCredit().subtract(registry.getSettledDebit()));
-                    else ksRepCashRegistersReport.setChangeBalance(registry.getSettledCredit());
-                }
+                BigDecimal settleCredit = registry.getSettledCredit() != null ? registry.getSettledCredit() : BigDecimal.ZERO;
+                BigDecimal settleDebit = registry.getSettledDebit() != null ? registry.getSettledDebit() : BigDecimal.ZERO;
+                ksRepCashRegistersReport.setChangeBalance(settleCredit.subtract(settleDebit));
 
-                if (registry.getCredit() != null) {
-                    if (registry.getDebit() != null)
-                        ksRepCashRegistersReport.setAddWithdraw(registry.getCredit().subtract(registry.getDebit()));
-                    else ksRepCashRegistersReport.setAddWithdraw(registry.getCredit());
-                }
+                BigDecimal credit = registry.getCredit() != null ? registry.getSettledCredit() : BigDecimal.ZERO;
+                BigDecimal debit = registry.getDebit() != null ? registry.getSettledDebit() : BigDecimal.ZERO;
+                ksRepCashRegistersReport.setAddWithdraw(credit.subtract(debit));
 
                 rows.add(ksRepCashRegistersReport);
             } catch (Throwable e) {