diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index e3ba585c71..14b48565a0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -440,7 +440,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds(); BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(FinSelectedReceivablesDetailedDto::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); - if (subscriptionMoneyAll.compareTo(StringUtils.isNotBlank(dto.getCollectionMoney())?new BigDecimal(dto.getCollectionMoney()):BigDecimal.ZERO) != 0) { + if (subscriptionMoneyAll.compareTo(StringUtils.isNotBlank(dto.getCollectionMoney()) ? new BigDecimal(dto.getCollectionMoney()) : BigDecimal.ZERO) != 0) { return rb.setMsg("认款总额与收款金额不符"); } List paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); @@ -1652,84 +1652,43 @@ public class FinCollectionConfirmationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(finBillApplication.getSid()); List finBillTrailerVos = finBillTrailerService.fetchByMainSid(finBillApplication.getSid()); 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("是"); - finVehicleInvoiceService.mySave(finVehicleInvoiceDto); - } - } - if (finBillTrailerVos != null) { - for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { - String gcVinNo = finBillTrailerVo.getGcVinNo(); - BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); - int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid()); + if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(finBillVehicleVo.getVinNo().substring(finBillVehicleVo.getVinNo().length() - 8))) { + 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()); @@ -1737,7 +1696,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService busBillVehicleVos = busBillVehicleFeign.fetchVehBySid(busBillApplication.getSid()).getData(); List busBillTrailerVos = busBillTrailerFeign.fetchByMainSid(busBillApplication.getSid()).getData(); for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) { - int count = finVehicleInvoiceService.selectCountByVinSid(busBillVehicleVo.getVehSid()); - if (count == 0) { - FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); - finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName()); - finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo()); - finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName()); - finVehicleInvoiceDto.setVehicleSid(busBillVehicleVo.getVehSid()); - finVehicleInvoiceDto.setVIN(busBillVehicleVo.getVinNo()); - finVehicleInvoiceDto.setInvoiceTypeKey(busBillVehicleVo.getBillTypeKey()); - finVehicleInvoiceDto.setInvoiceType(busBillVehicleVo.getBillTypeValue()); - finVehicleInvoiceDto.setInvoiceAmount(busBillApplication.getOneBillMoney()); - finVehicleInvoiceDto.setBillingStateKey("001"); - finVehicleInvoiceDto.setBillingState("未开票"); - finVehicleInvoiceDto.setTransferStateKey("001"); - finVehicleInvoiceDto.setTransferState("未移交"); - finVehicleInvoiceDto.setVehicleType("主车"); - finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid()); - finVehicleInvoiceDto.setInvoicingName(busBillVehicleVo.getOpenTickName()); - finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid()); - BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(busBillVehicleVo.getVehSid()).getData(); - if (busArrearsCarryVehicleApplyVo == null){ - finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey()); - finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue()); - }else { - finVehicleInvoiceDto.setBusinessStateKey("005"); - finVehicleInvoiceDto.setBusinessState("欠款提车"); - } - finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid()); - FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(busBillVehicleVo.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(busBillVehicleVo.getOpenTickSid()).getData(); - finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); - finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); - } - finVehicleInvoiceDto.setIsTakeTicket("是"); - finVehicleInvoiceService.mySave(finVehicleInvoiceDto); - } - } - if (busBillTrailerVos != null) { - for (BusBillTrailerVo busBillTrailerVo : busBillTrailerVos) { - String gcVinNo = busBillTrailerVo.getGcVinNo(); - BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); - int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid()); + if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(busBillVehicleVo.getVinNo().substring(busBillVehicleVo.getVinNo().length() - 8))) { + int count = finVehicleInvoiceService.selectCountByVinSid(busBillVehicleVo.getVehSid()); if (count == 0) { FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName()); finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo()); finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName()); - finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); - finVehicleInvoiceDto.setVIN(gcVinNo); - finVehicleInvoiceDto.setInvoiceTypeKey(busBillTrailerVo.getBillTypeKey()); - finVehicleInvoiceDto.setInvoiceType(busBillTrailerVo.getBillTypeValue()); - finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(busBillTrailerVo.getOneBillMoney())); + finVehicleInvoiceDto.setVehicleSid(busBillVehicleVo.getVehSid()); + finVehicleInvoiceDto.setVIN(busBillVehicleVo.getVinNo()); + finVehicleInvoiceDto.setInvoiceTypeKey(busBillVehicleVo.getBillTypeKey()); + finVehicleInvoiceDto.setInvoiceType(busBillVehicleVo.getBillTypeValue()); + finVehicleInvoiceDto.setInvoiceAmount(busBillApplication.getOneBillMoney()); finVehicleInvoiceDto.setBillingStateKey("001"); finVehicleInvoiceDto.setBillingState("未开票"); finVehicleInvoiceDto.setTransferStateKey("001"); finVehicleInvoiceDto.setTransferState("未移交"); - finVehicleInvoiceDto.setVehicleType("挂车"); + finVehicleInvoiceDto.setVehicleType("主车"); finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid()); - finVehicleInvoiceDto.setInvoicingName(busBillTrailerVo.getOpenTickName()); + finVehicleInvoiceDto.setInvoicingName(busBillVehicleVo.getOpenTickName()); finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid()); - finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey()); - finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue()); + BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(busBillVehicleVo.getVehSid()).getData(); + if (busArrearsCarryVehicleApplyVo == null) { + finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey()); + finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue()); + } else { + finVehicleInvoiceDto.setBusinessStateKey("005"); + finVehicleInvoiceDto.setBusinessState("欠款提车"); + } finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid()); - FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(busBillTrailerVo.getOpenTickSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(busBillVehicleVo.getOpenTickSid()); if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); @@ -1829,7 +1792,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService