From f4c5f91dcd3779b54965180dd8ce83f31660eb22 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 18 Oct 2023 15:03:50 +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

---
 .../BusValcustFilingService.java              | 108 ++++++++++++------
 1 file changed, 72 insertions(+), 36 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
index c562743e1a..81f78a32d5 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
@@ -598,17 +598,23 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                                         finVehicleInvoiceDto.setBusinessState("欠款提车");
                                     }
                                     finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
-                                    FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid()).getData();
-                                    if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                    ResultBean<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
+                                    if(finCompanyInvoicingDetailsVoResultBean.getData() != null){
+                                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingDetailsVoResultBean.getData();
                                         finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
                                         finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
                                         finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
                                         finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
                                         finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
-                                    } else {
-                                        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
-                                        finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
-                                        finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+
+                                    }else{
+                                        ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid());
+                                        if(crmCustomerTempVoResultBean.getData() != null){
+                                            CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempVoResultBean.getData();
+                                            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                        }
+
                                     }
                                     finVehicleInvoiceDto.setIsTakeTicket("是");
                                     finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
@@ -640,17 +646,23 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                                         finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
                                         finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
                                         finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
-                                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid()).getData();
-                                        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                        ResultBean<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
+                                        if(finCompanyInvoicingDetailsVoResultBean.getData() != null){
+                                            FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingDetailsVoResultBean.getData();
                                             finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
                                             finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
                                             finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
                                             finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
                                             finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
-                                        } else {
-                                            CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
-                                            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
-                                            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+
+                                        }else{
+                                            ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid());
+                                            if(crmCustomerTempVoResultBean.getData() != null){
+                                                CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempVoResultBean.getData();
+                                                finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                                finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                            }
+
                                         }
                                         finVehicleInvoiceDto.setIsTakeTicket("是");
                                         finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
@@ -726,17 +738,23 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                                     finVehicleInvoiceDto.setBusinessState("欠款提车");
                                 }
                                 finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid());
-                                FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillVehicleVo.getOpenTickSid()).getData();
-                                if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                ResultBean<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillVehicleVo.getOpenTickSid());
+                                if(finCompanyInvoicingDetailsVoResultBean.getData() != null){
+                                    FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingDetailsVoResultBean.getData();
                                     finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
                                     finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
                                     finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
                                     finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
                                     finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
-                                } else {
-                                    CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillVehicleVo.getOpenTickSid()).getData();
-                                    finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
-                                    finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+
+                                }else{
+                                    ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(busBillVehicleVo.getOpenTickSid());
+                                    if(crmCustomerTempVoResultBean.getData() != null){
+                                        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempVoResultBean.getData();
+                                        finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                        finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                    }
+
                                 }
                                 finVehicleInvoiceDto.setIsTakeTicket("是");
                                 finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
@@ -768,17 +786,23 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                                     finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey());
                                     finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue());
                                     finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid());
-                                    FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillTrailerVo.getOpenTickSid()).getData();
-                                    if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                    ResultBean<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillTrailerVo.getOpenTickSid());
+                                    if(finCompanyInvoicingDetailsVoResultBean.getData() != null){
+                                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingDetailsVoResultBean.getData();
                                         finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
                                         finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
                                         finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
                                         finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
                                         finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
-                                    } else {
-                                        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillTrailerVo.getOpenTickSid()).getData();
-                                        finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
-                                        finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+
+                                    }else{
+                                        ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(busBillTrailerVo.getOpenTickSid());
+                                        if(crmCustomerTempVoResultBean.getData() != null){
+                                            CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempVoResultBean.getData();
+                                            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                        }
+
                                     }
                                     finVehicleInvoiceDto.setIsTakeTicket("是");
                                     finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
@@ -818,17 +842,23 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                                     finVehicleInvoiceDto.setBusinessState("欠款提车");
                                 }
                                 finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
-                                FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid()).getData();
-                                if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                ResultBean<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
+                                if(finCompanyInvoicingDetailsVoResultBean.getData() != null){
+                                    FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingDetailsVoResultBean.getData();
                                     finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
                                     finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
                                     finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
                                     finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
                                     finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
-                                } else {
-                                    CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
-                                    finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
-                                    finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+
+                                }else{
+                                    ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid());
+                                    if(crmCustomerTempVoResultBean.getData() != null){
+                                        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempVoResultBean.getData();
+                                        finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                        finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                    }
+
                                 }
                                 finVehicleInvoiceDto.setIsTakeTicket("是");
                                 finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
@@ -860,17 +890,23 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                                     finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
                                     finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
                                     finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
-                                    FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid()).getData();
-                                    if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                                    ResultBean<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
+                                    if(finCompanyInvoicingDetailsVoResultBean.getData() != null){
+                                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingDetailsVoResultBean.getData();
                                         finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
                                         finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
                                         finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
                                         finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
                                         finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
-                                    } else {
-                                        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
-                                        finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
-                                        finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+
+                                    }else{
+                                        ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid());
+                                        if(crmCustomerTempVoResultBean.getData() != null){
+                                            CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempVoResultBean.getData();
+                                            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                        }
+
                                     }
                                     finVehicleInvoiceDto.setIsTakeTicket("是");
                                     finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);