From 8c1d66eae3b7c99541a22dbc2fa9540496579c46 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 2 Jan 2025 14:37:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E6=AC=BE=E5=B7=AE=E9=A2=9D=E8=AE=A4?=
 =?UTF-8?q?=E6=AC=BE=E6=8E=A8=E9=80=81=E5=8D=95=E8=BD=A6=E8=BF=94=E5=88=A9?=
 =?UTF-8?q?=E6=97=B6=E9=AA=8C=E8=AF=81=E5=8E=82=E5=AE=B6=E8=B4=B4=E6=81=AF?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java        | 16 +++++++++++++++-
 .../riskcenter/biz/loandiff/LoanDiffService.java |  9 ++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 5969002cfc..e8d28a9cbb 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -2234,7 +2234,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
                                 scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString());
                                 scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString());
-                                scmVehRebateVehDto.setEstimateRebate(loanSolutions.getActualDiscount().add(loanSolutionsOtherpolicy.getOtherActualDiscount()).toString());
+                                BigDecimal ll = BigDecimal.ZERO;
+                                if(loanSolutions.getActualDiscount() != null){
+                                    ll = ll.add(loanSolutions.getActualDiscount());
+                                }
+                                if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
+                                    ll = ll.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
+                                }
+                                scmVehRebateVehDto.setEstimateRebate(ll.toString());
                                 scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
                                 scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
                                 scmVehRebateVehDtos.add(scmVehRebateVehDto);
@@ -2396,6 +2403,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
                             scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString());
                             scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString());
+                            BigDecimal ll = BigDecimal.ZERO;
+                            if(loanSolutions.getActualDiscount() != null){
+                                ll = ll.add(loanSolutions.getActualDiscount());
+                            }
+                            if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
+                                ll = ll.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
+                            }
                             scmVehRebateVehDto.setEstimateRebate(loanSolutions.getActualDiscount().add(loanSolutionsOtherpolicy.getOtherActualDiscount()).toString());
                             scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
                             scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
index ae39d4bfd2..b21c11ccc0 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
@@ -450,7 +450,14 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                 scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
                 scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString());
                 scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString());
-                scmVehRebateVehDto.setEstimateRebate(loanDiffDetails.getRealityDiscount().add(loanDiffDetails.getRealityOtherDiscount()).toString());
+                BigDecimal ll = BigDecimal.ZERO;
+                if(loanDiffDetails.getRealityDiscount() != null){
+                    ll = ll.add(loanDiffDetails.getRealityDiscount());
+                }
+                if(loanDiffDetails.getRealityOtherDiscount() != null){
+                    ll = ll.add(loanDiffDetails.getRealityOtherDiscount());
+                }
+                scmVehRebateVehDto.setEstimateRebate(ll.toString());
                 scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
                 scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
                 scmVehRebateVehDtos.add(scmVehRebateVehDto);