From 9b89b26574d4017e0cf2f702c3aef3f41ee5b3bd Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 28 May 2025 11:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanRepurchaseApplyService.java             | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
index c97e7a2906..28dfffdce6 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
@@ -981,8 +981,17 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
             BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();//合同违约金
             BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();//名义价
             BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();//资方其他应收
-            BigDecimal all2 = bankContractLiquidated.add(bankNominalPrice).add(bankOtherReceivable);
-            if(bankContractLiquidated.compareTo(BigDecimal.ZERO)>0){
+            BigDecimal all2 = BigDecimal.ZERO;
+            if(bankContractLiquidated != null){
+                all2 = all2.add(bankContractLiquidated);
+            }
+            if(bankNominalPrice != null){
+                all2 = all2.add(bankNominalPrice);
+            }
+            if(bankOtherReceivable != null){
+                all2 = all2.add(bankOtherReceivable);
+            }
+            if(bankContractLiquidated != null && bankContractLiquidated.compareTo(BigDecimal.ZERO)>0){
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
                 if (null != dictCommonVo) {
                     voucherResultDetailDtoDf.setSubjectNo(dictCommonVo.getDictValue());
@@ -995,7 +1004,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                 voucherResultDetailDtoDf.setCredit(bankContractLiquidated.toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf);
             }
-            if(bankNominalPrice.compareTo(BigDecimal.ZERO)>0){
+            if(bankNominalPrice != null && bankNominalPrice.compareTo(BigDecimal.ZERO)>0){
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
                 if (null != dictCommonVo) {
                     voucherResultDetailDtoDf.setSubjectNo(dictCommonVo.getDictValue());
@@ -1008,7 +1017,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                 voucherResultDetailDtoDf.setCredit(bankNominalPrice.toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf);
             }
-            if(bankOtherReceivable.compareTo(BigDecimal.ZERO)>0){
+            if(bankOtherReceivable != null && bankOtherReceivable.compareTo(BigDecimal.ZERO)>0){
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
                 if (null != dictCommonVo) {
                     voucherResultDetailDtoDf.setSubjectNo(dictCommonVo.getDictValue());