|
|
@ -786,7 +786,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
if (i == 1){ |
|
|
|
busValcustFilingDto.setIsGdk("0"); |
|
|
|
String parameterValue = loanParameterFeign.fetchByParNo("CW_JZPZSXFBL").getData(); |
|
|
|
busValcustFilingDto.setYsMoney(money.multiply(new BigDecimal(parameterValue)).toString());; |
|
|
|
busValcustFilingDto.setYsMoney(money.multiply(new BigDecimal(parameterValue)).toString()); |
|
|
|
}else { |
|
|
|
busValcustFilingDto.setIsGdk("1"); |
|
|
|
busValcustFilingDto.setYsMoney("0"); |
|
|
@ -2227,6 +2227,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
bv.setModelId(finBillApplication.getProcDefId()); |
|
|
|
//判断是否领取发票原件,若是,则isTrue网关参数为true=============添加
|
|
|
|
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是")); |
|
|
|
//查询销售订单价格信息
|
|
|
|
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(finBillApplication.getContractNo()).getData(); |
|
|
|
//查询销售订单信息
|
|
|
|
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData(); |
|
|
|
//========================================
|
|
|
|
finBillApplication = fetchBySid(businessSid); |
|
|
|
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); |
|
|
@ -2250,78 +2254,73 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { |
|
|
|
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid); |
|
|
|
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid); |
|
|
|
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { |
|
|
|
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid()); |
|
|
|
if (count == 0) { |
|
|
|
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); |
|
|
|
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); |
|
|
|
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); |
|
|
|
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); |
|
|
|
finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid()); |
|
|
|
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo()); |
|
|
|
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey()); |
|
|
|
finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue()); |
|
|
|
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney()); |
|
|
|
finVehicleInvoiceDto.setBillingStateKey("001"); |
|
|
|
finVehicleInvoiceDto.setBillingState("未开票"); |
|
|
|
finVehicleInvoiceDto.setTransferStateKey("001"); |
|
|
|
finVehicleInvoiceDto.setTransferState("未移交"); |
|
|
|
finVehicleInvoiceDto.setVehicleType("主车"); |
|
|
|
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); |
|
|
|
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName()); |
|
|
|
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); |
|
|
|
BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData(); |
|
|
|
if (busArrearsCarryVehicleApplyVo == null) { |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); |
|
|
|
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); |
|
|
|
} else { |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey("005"); |
|
|
|
finVehicleInvoiceDto.setBusinessState("欠款提车"); |
|
|
|
} |
|
|
|
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); |
|
|
|
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid()); |
|
|
|
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(finBillVehicleVo.getOpenTickSid()).getData(); |
|
|
|
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); |
|
|
|
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); |
|
|
|
} |
|
|
|
finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice()); |
|
|
|
finVehicleInvoiceService.mySave(finVehicleInvoiceDto); |
|
|
|
/*if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
|
|
|
|
BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto(); |
|
|
|
busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid()); |
|
|
|
busValcustFilingDto.setCreateByName(finBillApplication.getCreateByName()); |
|
|
|
busValcustFilingDto.setOrgSidPath(finBillApplication.getOrgSidPath()); |
|
|
|
busValcustFilingDto.setUseOrgSid(finBillApplication.getUseOrgSid()); |
|
|
|
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(finBillApplication.getUseOrgSid()).getData(); |
|
|
|
busValcustFilingDto.setUseOrgName(sysOrganizationVo.getName()); |
|
|
|
busValcustFilingDto.setApplyDeptSid(finBillApplication.getDeptSid()); |
|
|
|
busValcustFilingDto.setApplyDeptName(finBillApplication.getDeptName()); |
|
|
|
busValcustFilingDto.setContractNo(finBillApplication.getContractNo()); |
|
|
|
busValcustFilingDto.setModelSid(finBillApplication.getModelSid()); |
|
|
|
busValcustFilingDto.setModelName(finBillApplication.getModelName()); |
|
|
|
String vinSid = ""; |
|
|
|
String vinNo = ""; |
|
|
|
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { |
|
|
|
vinSid = vinSid + finBillVehicleVo.getVehSid() + ","; |
|
|
|
vinNo = vinNo + finBillVehicleVo.getVinNo() + ","; |
|
|
|
} |
|
|
|
} |
|
|
|
if (finBillTrailerVos != null) { |
|
|
|
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { |
|
|
|
String gcVinNo = finBillTrailerVo.getGcVinNo(); |
|
|
|
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); |
|
|
|
int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid()); |
|
|
|
busValcustFilingDto.setVinSid(vinSid.substring(0, vinSid.lastIndexOf(","))); |
|
|
|
busValcustFilingDto.setVinNo(vinNo.substring(0, vinNo.lastIndexOf(","))); |
|
|
|
BigDecimal money = finBillApplication.getOneBillMoney().subtract(data.getSingleFinalPrice()); |
|
|
|
int i = money.compareTo(BigDecimal.ZERO); |
|
|
|
if (i == 1) { |
|
|
|
busValcustFilingDto.setIsGdk("0"); |
|
|
|
String parameterValue = loanParameterFeign.fetchByParNo("CW_JZPZSXFBL").getData(); |
|
|
|
busValcustFilingDto.setYsMoney(money.multiply(new BigDecimal(parameterValue)).toString()); |
|
|
|
} else { |
|
|
|
busValcustFilingDto.setIsGdk("1"); |
|
|
|
busValcustFilingDto.setYsMoney("0"); |
|
|
|
} |
|
|
|
busValcustFilingDto.setMoney(money.abs().toString()); |
|
|
|
busValcustFilingDto.setSaleOrderSid(busSalesOrder.getSid()); |
|
|
|
busValcustFilingDto.setBusSid(finBillApplication.getSid()); |
|
|
|
busValcustFilingDto.setBusSid("0"); |
|
|
|
busValcustFilingFeign.save(busValcustFilingDto); |
|
|
|
} else {*///不是高低开
|
|
|
|
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { |
|
|
|
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid()); |
|
|
|
if (count == 0) { |
|
|
|
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); |
|
|
|
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); |
|
|
|
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); |
|
|
|
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); |
|
|
|
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); |
|
|
|
finVehicleInvoiceDto.setVIN(gcVinNo); |
|
|
|
finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey()); |
|
|
|
finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue()); |
|
|
|
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney())); |
|
|
|
finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid()); |
|
|
|
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo()); |
|
|
|
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey()); |
|
|
|
finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue()); |
|
|
|
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney()); |
|
|
|
finVehicleInvoiceDto.setBillingStateKey("001"); |
|
|
|
finVehicleInvoiceDto.setBillingState("未开票"); |
|
|
|
finVehicleInvoiceDto.setTransferStateKey("001"); |
|
|
|
finVehicleInvoiceDto.setTransferState("未移交"); |
|
|
|
finVehicleInvoiceDto.setVehicleType("挂车"); |
|
|
|
finVehicleInvoiceDto.setVehicleType("主车"); |
|
|
|
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); |
|
|
|
finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName()); |
|
|
|
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName()); |
|
|
|
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); |
|
|
|
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); |
|
|
|
BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData(); |
|
|
|
if (busArrearsCarryVehicleApplyVo == null) { |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); |
|
|
|
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); |
|
|
|
} else { |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey("005"); |
|
|
|
finVehicleInvoiceDto.setBusinessState("欠款提车"); |
|
|
|
} |
|
|
|
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); |
|
|
|
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid()); |
|
|
|
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid()); |
|
|
|
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { |
|
|
|
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); |
|
|
|
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); |
|
|
@ -2329,7 +2328,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); |
|
|
|
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); |
|
|
|
} else { |
|
|
|
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData(); |
|
|
|
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData(); |
|
|
|
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); |
|
|
|
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); |
|
|
|
} |
|
|
@ -2337,12 +2336,54 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
finVehicleInvoiceService.mySave(finVehicleInvoiceDto); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData(); |
|
|
|
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney(); |
|
|
|
if (oneBillMoney == null) { |
|
|
|
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString()); |
|
|
|
} |
|
|
|
if (finBillTrailerVos != null) { |
|
|
|
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { |
|
|
|
String gcVinNo = finBillTrailerVo.getGcVinNo(); |
|
|
|
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); |
|
|
|
int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid()); |
|
|
|
if (count == 0) { |
|
|
|
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); |
|
|
|
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); |
|
|
|
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); |
|
|
|
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); |
|
|
|
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); |
|
|
|
finVehicleInvoiceDto.setVIN(gcVinNo); |
|
|
|
finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey()); |
|
|
|
finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue()); |
|
|
|
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney())); |
|
|
|
finVehicleInvoiceDto.setBillingStateKey("001"); |
|
|
|
finVehicleInvoiceDto.setBillingState("未开票"); |
|
|
|
finVehicleInvoiceDto.setTransferStateKey("001"); |
|
|
|
finVehicleInvoiceDto.setTransferState("未移交"); |
|
|
|
finVehicleInvoiceDto.setVehicleType("挂车"); |
|
|
|
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); |
|
|
|
finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName()); |
|
|
|
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); |
|
|
|
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); |
|
|
|
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); |
|
|
|
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); |
|
|
|
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid()); |
|
|
|
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(finBillTrailerVo.getOpenTickSid()).getData(); |
|
|
|
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); |
|
|
|
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); |
|
|
|
} |
|
|
|
finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice()); |
|
|
|
finVehicleInvoiceService.mySave(finVehicleInvoiceDto); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney(); |
|
|
|
if (oneBillMoney == null) { |
|
|
|
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString()); |
|
|
|
} |
|
|
|
//}
|
|
|
|
} else { |
|
|
|
//极光推送
|
|
|
|
finBillApplication = fetchBySid(businessSid); |
|
|
|