From c83b8e1ba3adab2de3994b9b7a25a885c34090aa Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 20 Jun 2023 15:47:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseVehicleOutApplyService.java              | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
index 3cc3cbc095..fae7507cc1 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
@@ -163,18 +163,26 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
             //贴息
             String concatNo = record.getConcatNo();
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(concatNo).getData();
-            if (StringUtils.isNotBlank(busSalesOrder.getSid())){
+            if (StringUtils.isNotBlank(busSalesOrder.getSid())) {
                 String saleOrderSid = busSalesOrder.getSid();
                 SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetailsss(saleOrderSid).getData();
-                if (solutionsDetailsVo != null){
+                if (solutionsDetailsVo != null) {
                     record.setFactoryDiscount(solutionsDetailsVo.getFactoryDiscount());
                 }
             }
+            String rebateMoneyOne = record.getRebateMoneyOne();
+            String rebateMoneyTwo = record.getRebateMoneyTwo();
+            if (StringUtils.isBlank(rebateMoneyOne)) {
+                rebateMoneyOne = "0";
+            }
+            if (StringUtils.isBlank(rebateMoneyTwo)) {
+                rebateMoneyTwo = "0";
+            }
             //中介返利
-            record.setDistributorPriceAll(new BigDecimal(record.getRebateMoneyOne()).add(new BigDecimal(record.getRebateMoneyTwo())).toString());
+            record.setDistributorPriceAll(new BigDecimal(rebateMoneyOne).add(new BigDecimal(rebateMoneyTwo)).toString());
             //开票类型
             FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinSids(record.getMaterialSid()).getData();
-            if (StringUtils.isNotBlank(finVehicleInvoice.getSid())){
+            if (finVehicleInvoice != null) {
                 record.setKpType(finVehicleInvoice.getBusinessState());
             }
         }