|
@ -979,18 +979,22 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
finVehicleInvoiceDto.setBusinessState("欠款提车"); |
|
|
finVehicleInvoiceDto.setBusinessState("欠款提车"); |
|
|
} |
|
|
} |
|
|
finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid()); |
|
|
finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid()); |
|
|
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillVehicleVo.getOpenTickSid()).getData(); |
|
|
ResultBean<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillVehicleVo.getOpenTickSid()); |
|
|
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { |
|
|
if (finCompanyInvoicingDetailsVoResultBean.getData() != null) { |
|
|
|
|
|
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingDetailsVoResultBean.getData(); |
|
|
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); |
|
|
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); |
|
|
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); |
|
|
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); |
|
|
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); |
|
|
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); |
|
|
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); |
|
|
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); |
|
|
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); |
|
|
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); |
|
|
} else { |
|
|
} else { |
|
|
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillVehicleVo.getOpenTickSid()).getData(); |
|
|
ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(busBillVehicleVo.getOpenTickSid()); |
|
|
|
|
|
if (crmCustomerTempVoResultBean.getData() != null) { |
|
|
|
|
|
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempVoResultBean.getData(); |
|
|
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); |
|
|
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); |
|
|
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); |
|
|
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
finVehicleInvoiceDto.setIsTakeTicket("是"); |
|
|
finVehicleInvoiceDto.setIsTakeTicket("是"); |
|
|
finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto); |
|
|
finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto); |
|
|
} |
|
|
} |
|
@ -1356,19 +1360,19 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
ResultBean<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillApplication.getOpenTickSid()); |
|
|
ResultBean<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillApplication.getOpenTickSid()); |
|
|
if (finCompanyInvoicingDetailsVoResultBean.getData() != null) { |
|
|
if (finCompanyInvoicingDetailsVoResultBean.getData() != null) { |
|
|
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingDetailsVoResultBean.getData(); |
|
|
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingDetailsVoResultBean.getData(); |
|
|
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { |
|
|
|
|
|
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); |
|
|
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); |
|
|
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); |
|
|
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); |
|
|
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); |
|
|
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); |
|
|
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); |
|
|
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); |
|
|
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); |
|
|
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); |
|
|
} else { |
|
|
} else { |
|
|
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillApplication.getOpenTickSid()).getData(); |
|
|
ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(busBillApplication.getOpenTickSid()); |
|
|
if (crmCustomerTempVo != null) { |
|
|
if (crmCustomerTempVoResultBean.getData() != null) { |
|
|
|
|
|
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempVoResultBean.getData(); |
|
|
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); |
|
|
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); |
|
|
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); |
|
|
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
finVehicleInvoiceDto.setIsTakeTicket(busBillApplication.getIsLQOrigInvoice()); |
|
|
finVehicleInvoiceDto.setIsTakeTicket(busBillApplication.getIsLQOrigInvoice()); |
|
|
finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto); |
|
|
finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto); |
|
|