Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@@ -163,18 +163,28 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
             //贴息
             String concatNo = record.getConcatNo();
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(concatNo).getData();
-            if (StringUtils.isNotBlank(busSalesOrder.getSid())){
+            if (busSalesOrder != null) {
                 String saleOrderSid = busSalesOrder.getSid();
-                SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetailsss(saleOrderSid).getData();
-                if (solutionsDetailsVo != null){
-                    record.setFactoryDiscount(solutionsDetailsVo.getFactoryDiscount());
+                if (StringUtils.isNotBlank(saleOrderSid)){
+                    SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetailsss(saleOrderSid).getData();
+                    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());
             }
         }