yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化欠款出库推送

master
dimengzhe 2 years ago
parent
f6acc5e6ce
commit
7b8bfb11e5
1 changed files with 36 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 68
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

68
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -979,17 +979,21 @@ 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());
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); if (crmCustomerTempVoResultBean.getData() != null) {
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempVoResultBean.getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
} }
finVehicleInvoiceDto.setIsTakeTicket("是"); finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto); finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
@ -1030,7 +1034,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else { } else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillTrailerVo.getOpenTickSid()).getData(); CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillTrailerVo.getOpenTickSid()).getData();
if (crmCustomerTempVo != null){ if (crmCustomerTempVo != null) {
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
} }
@ -1290,14 +1294,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
//若为增值税发票，若若高低开则推送价格客户备案、若不是高低开，则推送开票管理 //若为增值税发票，若若高低开则推送价格客户备案、若不是高低开，则推送开票管理
detailsList.removeAll(Collections.singleton(null)); detailsList.removeAll(Collections.singleton(null));
BusSalesOrderPrice data = busSalesOrderService.selectByContractNoOne(busDeliveredApply.getContractNo()).getData(); BusSalesOrderPrice data = busSalesOrderService.selectByContractNoOne(busDeliveredApply.getContractNo()).getData();
if(!detailsList.isEmpty()){ if (!detailsList.isEmpty()) {
for (int i = 0; i < detailsList.size(); i++) { for (int i = 0; i < detailsList.size(); i++) {
BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i); BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
//根据合同和车辆sid获取欠款开票的信息 //根据合同和车辆sid获取欠款开票的信息
BusBillApplication busBillApplication = busBillApplicationService.selectByContractNoAndSid(busDeliveredApply.getContractNo(),busDeliveredApplyDetails.getVinSid()); BusBillApplication busBillApplication = busBillApplicationService.selectByContractNoAndSid(busDeliveredApply.getContractNo(), busDeliveredApplyDetails.getVinSid());
if(busBillApplication != null){ if (busBillApplication != null) {
if("02".equals(busBillApplication.getOpenTickTypeKey())){ if ("02".equals(busBillApplication.getOpenTickTypeKey())) {
if(!data.getSingleFinalPrice().equals(busBillApplication.getOneBillMoney())){ if (!data.getSingleFinalPrice().equals(busBillApplication.getOneBillMoney())) {
//若高低开，推送价值客户备案 //若高低开，推送价值客户备案
BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto(); BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto();
busValcustFilingDto.setCreateBySid(busBillApplication.getCreateBySid()); busValcustFilingDto.setCreateBySid(busBillApplication.getCreateBySid());
@ -1329,9 +1333,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
busValcustFilingDto.setBusSource("0"); busValcustFilingDto.setBusSource("0");
busValcustFilingService.saveOrUpdateDto(busValcustFilingDto); busValcustFilingService.saveOrUpdateDto(busValcustFilingDto);
}else{ } else {
//不是高低开，推送开票管理 //不是高低开，推送开票管理
int count = baseMapper.selectCountByVinSid(busDeliveredApplyDetails.getVinSid(),busBillApplication.getContractNo()); int count = baseMapper.selectCountByVinSid(busDeliveredApplyDetails.getVinSid(), busBillApplication.getContractNo());
if (count == 0) { if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName()); finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName());
@ -1354,21 +1358,21 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue()); finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid()); finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid());
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 { ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(busBillApplication.getOpenTickSid());
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillApplication.getOpenTickSid()).getData(); if (crmCustomerTempVoResultBean.getData() != null) {
if (crmCustomerTempVo != 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);
@ -1718,9 +1722,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
} }
public void pushInvoice2(BusDeliveredApply busDeliveredApply, public void pushInvoice2(BusDeliveredApply busDeliveredApply,
List<BusDeliveredApplyDetails> detailsList, List<BusDeliveredApplyDetails> detailsList,
AppOrderDetailsVo appOrderDetailsVo, AppOrderDetailsVo appOrderDetailsVo,
SysUserVo sysUserVo) { SysUserVo sysUserVo) {
log.info("推送开票申请数据开始啦~~~~~~~~~~~~~~~~~~~~~~~~=============================="); log.info("推送开票申请数据开始啦~~~~~~~~~~~~~~~~~~~~~~~~==============================");
//推送开票申请======= //推送开票申请=======
FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto(); FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
@ -3909,21 +3913,21 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (!promiseList.isEmpty()) { if (!promiseList.isEmpty()) {
String promiseFile = String.join(",", promiseList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); String promiseFile = String.join(",", promiseList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busDeliveredApply.setPromiseFile(promiseFile); busDeliveredApply.setPromiseFile(promiseFile);
}else{ } else {
busDeliveredApply.setPromiseFile(""); busDeliveredApply.setPromiseFile("");
} }
danFileList.removeAll(Collections.singleton(null)); danFileList.removeAll(Collections.singleton(null));
if (!danFileList.isEmpty()) { if (!danFileList.isEmpty()) {
String danFile = String.join(",", danFileList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); String danFile = String.join(",", danFileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busDeliveredApply.setDanFile(danFile); busDeliveredApply.setDanFile(danFile);
}else{ } else {
busDeliveredApply.setDanFile(""); busDeliveredApply.setDanFile("");
} }
carFileList.removeAll(Collections.singleton(null)); carFileList.removeAll(Collections.singleton(null));
if (!carFileList.isEmpty()) { if (!carFileList.isEmpty()) {
String carFile = String.join(",", carFileList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); String carFile = String.join(",", carFileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
busDeliveredApply.setCarFile(carFile); busDeliveredApply.setCarFile(carFile);
}else{ } else {
busDeliveredApply.setCarFile(""); busDeliveredApply.setCarFile("");
} }
baseMapper.updateById(busDeliveredApply); baseMapper.updateById(busDeliveredApply);

Write Preview
Loading…
Cancel
Save