diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 654d0a0396..7f1b3be1e7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -979,17 +979,21 @@ public class BusDeliveredApplyService extends MybatisBaseService 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()); + ResultBean 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); @@ -1030,7 +1034,7 @@ public class BusDeliveredApplyService extends MybatisBaseService finCompanyInvoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillApplication.getOpenTickSid()); - if(finCompanyInvoicingDetailsVoResultBean.getData() != null){ + if (finCompanyInvoicingDetailsVoResultBean.getData() != null) { FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingDetailsVoResultBean.getData(); - if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { - 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(busBillApplication.getOpenTickSid()).getData(); - if (crmCustomerTempVo != null) { - finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); - finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); - } + finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); + finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); + finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); + finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); + finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); + } else { + ResultBean crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(busBillApplication.getOpenTickSid()); + if (crmCustomerTempVoResultBean.getData() != null) { + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempVoResultBean.getData(); + finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); + finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); } + } finVehicleInvoiceDto.setIsTakeTicket(busBillApplication.getIsLQOrigInvoice()); finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto); @@ -1718,9 +1722,9 @@ public class BusDeliveredApplyService extends MybatisBaseService detailsList, - AppOrderDetailsVo appOrderDetailsVo, - SysUserVo sysUserVo) { + List detailsList, + AppOrderDetailsVo appOrderDetailsVo, + SysUserVo sysUserVo) { log.info("推送开票申请数据开始啦~~~~~~~~~~~~~~~~~~~~~~~~=============================="); //推送开票申请======= FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto(); @@ -3909,21 +3913,21 @@ public class BusDeliveredApplyService extends MybatisBaseService