From 25720f5ceaa2352cd50501835bfea1f07423df13 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 18 Apr 2024 11:47:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E8=AE=BF=E8=80=83=E5=AF=9F=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=20=E5=87=BA=E5=BA=93=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyService.java | 110 +++++++++++------- .../LoanHomeVisitInvestigateService.java | 24 ++-- .../as/feign/flowable/flow/ProcDefEnum.java | 2 +- 3 files changed, 81 insertions(+), 55 deletions(-) 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 32d1a67bfd..475dc5c0bf 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 @@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo; import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanFeign; import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; +import com.yxt.anrui.base.api.basetrailer.TrailerVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; @@ -110,6 +111,7 @@ import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign; import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerFeign; import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; +import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo; @@ -236,6 +238,8 @@ public class BusDeliveredApplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getStaffUserSid()); - BusBillApplication busBillApplication = busBillApplicationService.selectByCkSidAll(busDeliveredApply.getSid()); - List busBillTrailerVos = busBillTrailerService.fetchByMainSid(busBillApplication.getSid()); if ("1".equals(busDeliveredApply.getHasInvoiceKey())) { BusSalesOrderPrice data = busSalesOrderService.selectByContractNoOne(busDeliveredApply.getContractNo()).getData(); BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo()); + BusBillApplication busBillApplication = busBillApplicationService.selectByCkSidAll(busDeliveredApply.getSid()); List busBillVehicleVos = busBillVehicleService.fetchVehBySid(busBillApplication.getSid()); + List busBillTrailerVos = busBillTrailerService.fetchByMainSid(busBillApplication.getSid()); if (!data.getSingleFinalPrice().equals(busBillApplication.getOneBillMoney())) {//是高低开 BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto(); busValcustFilingDto.setCreateBySid(busBillApplication.getCreateBySid()); @@ -1071,49 +1076,68 @@ public class BusDeliveredApplyService extends MybatisBaseService trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo()); + if (trailerList.getData() != null) { + if (!trailerList.getData().getList().isEmpty()) { + //根据合同号查询主车对应的已办结开票信息sid + String kpsqSid = finBillApplicationFeign.selectByCompContractNo(busDeliveredApply.getContractNo()).getData(); + if (StringUtils.isNotBlank(kpsqSid)) {//主车存在已办结的开票信息 + for (TrailerVo busBillTrailerVo : trailerList.getData().getList()) { + //根据挂车车架号和开票信息sid查询是否存在挂车对应的开票信息 + Integer count = finBillTrailerFeign.fetchByGcVinNo(busBillTrailerVo.getTrailerVinNo(), kpsqSid).getData(); + if (count == 0) {//不存在则推送挂车的开票管理信息 + //根据挂车车架号查询挂车信息 + BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(busBillTrailerVo.getTrailerVinNo()).getData(); + //根据主车sid和合同号查询主车的开票管理信息 + FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo()).getData(); + //根据主车sid查询主车的开票信息 + FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(busDeliveredApplyDetails.getVinSid()).getData(); + //根据销售订单sid查询金融方案 + SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData(); + FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); + finVehicleInvoiceDto.setInvoiceTitle(finVehicleInvoice.getInvoiceTitle()); + finVehicleInvoiceDto.setContractNo(finVehicleInvoice.getContractNo()); + finVehicleInvoiceDto.setCustomerName(finVehicleInvoice.getCustomerName()); + finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); + finVehicleInvoiceDto.setVIN(busBillTrailerVo.getTrailerVinNo()); + finVehicleInvoiceDto.setInvoiceTypeKey(finVehicleInvoice.getInvoiceTypeKey()); + finVehicleInvoiceDto.setInvoiceType(finVehicleInvoice.getInvoiceType()); + if (StringUtils.isNotBlank(solutionsDetailsVo.getTrailerAmount())){ + finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(solutionsDetailsVo.getTrailerAmount())); + } + finVehicleInvoiceDto.setBillingStateKey("001"); + finVehicleInvoiceDto.setBillingState("未开票"); + finVehicleInvoiceDto.setTransferStateKey("001"); + finVehicleInvoiceDto.setTransferState("未移交"); + finVehicleInvoiceDto.setVehicleType("挂车"); + finVehicleInvoiceDto.setBillingSid(finVehicleInvoice.getBillingSid()); + finVehicleInvoiceDto.setInvoicingName(finVehicleInvoice.getInvoicingName()); + finVehicleInvoiceDto.setCreateBySid(finVehicleInvoice.getCreateBySid()); + finVehicleInvoiceDto.setBusinessStateKey(finVehicleInvoice.getBusinessStateKey()); + finVehicleInvoiceDto.setBusinessState(finVehicleInvoice.getBusinessState()); + finVehicleInvoiceDto.setUseOrgSid(finVehicleInvoice.getUseOrgSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillVehicleDetailsVo.getOpenTickSid()).getData(); + if (finCompanyInvoicingDetailsVo != null) { + 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(finBillVehicleDetailsVo.getOpenTickSid()).getData(); + if (crmCustomerTempVo != null) { + finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); + finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); + } + } + finVehicleInvoiceDto.setIsTakeTicket("是"); + finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto); } } - finVehicleInvoiceDto.setIsTakeTicket("是"); - finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto); } } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index 6954871773..08b39d07b4 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -207,17 +207,19 @@ public class LoanHomeVisitInvestigateService { LoanHomeVisitInvestigateSaveCustomerDto loanHomeVisitInvestigateSaveCustomerDto = new LoanHomeVisitInvestigateSaveCustomerDto(); BeanUtil.copyProperties(dto, loanHomeVisitInvestigateSaveCustomerDto); LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByMainSid(dto.getSid()).getData(); - loanHomeVisitInvestigateSaveCustomerDto.setVehRegis(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis()); - loanHomeVisitInvestigateSaveCustomerDto.setIsSecurity(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity()); - loanHomeVisitInvestigateSaveCustomerDto.setAccCompName(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName()); - loanHomeVisitInvestigateSaveCustomerDto.setAccCompRegistNum(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum()); - loanHomeVisitInvestigateSaveCustomerDto.setAccCompContract(loanHomevisitInvestigateCustomerDetailsVo.getAccCompContract()); - loanHomeVisitInvestigateSaveCustomerDto.setAccComphone(loanHomevisitInvestigateCustomerDetailsVo.getAccComphone()); - loanHomeVisitInvestigateSaveCustomerDto.setAccCompAddress(loanHomevisitInvestigateCustomerDetailsVo.getAccCompAddress()); - loanHomeVisitInvestigateSaveCustomerDto.setAccCompxAddress(loanHomevisitInvestigateCustomerDetailsVo.getAccCompxAddress()); - loanHomeVisitInvestigateSaveCustomerDto.setIsCompBuy(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy()); - loanHomeVisitInvestigateSaveCustomerDto.setConSetUpKey(loanHomevisitInvestigateCustomerDetailsVo.getConSetUpKey()); - loanHomeVisitInvestigateSaveCustomerDto.setContractUrl(loanHomevisitInvestigateCustomerDetailsVo.getContractUrl()); + if (loanHomevisitInvestigateCustomerDetailsVo != null){ + loanHomeVisitInvestigateSaveCustomerDto.setVehRegis(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis()); + loanHomeVisitInvestigateSaveCustomerDto.setIsSecurity(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity()); + loanHomeVisitInvestigateSaveCustomerDto.setAccCompName(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName()); + loanHomeVisitInvestigateSaveCustomerDto.setAccCompRegistNum(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum()); + loanHomeVisitInvestigateSaveCustomerDto.setAccCompContract(loanHomevisitInvestigateCustomerDetailsVo.getAccCompContract()); + loanHomeVisitInvestigateSaveCustomerDto.setAccComphone(loanHomevisitInvestigateCustomerDetailsVo.getAccComphone()); + loanHomeVisitInvestigateSaveCustomerDto.setAccCompAddress(loanHomevisitInvestigateCustomerDetailsVo.getAccCompAddress()); + loanHomeVisitInvestigateSaveCustomerDto.setAccCompxAddress(loanHomevisitInvestigateCustomerDetailsVo.getAccCompxAddress()); + loanHomeVisitInvestigateSaveCustomerDto.setIsCompBuy(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy()); + loanHomeVisitInvestigateSaveCustomerDto.setConSetUpKey(loanHomevisitInvestigateCustomerDetailsVo.getConSetUpKey()); + loanHomeVisitInvestigateSaveCustomerDto.setContractUrl(loanHomevisitInvestigateCustomerDetailsVo.getContractUrl()); + } ResultBean resultBean = loanHomevisitInvestigateFeign.saveHomeVisitCustomerInfo(loanHomeVisitInvestigateSaveCustomerDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java index f183e24ac9..9bbecdfa6b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java @@ -83,7 +83,7 @@ public enum ProcDefEnum { LOANLAWSUITAPPLY("诉讼申请", "process_xc4lp97d:1:8380004"), LOANCASEENTRUSTLAWYERAPPLY("案件委托律师", "process_oe3nvzgn:1:8525004"), ASARREARSOUTAPPLY("欠款出厂申请", "process_u14c671d:1:10442504"), - ASOLDPARTRETURNAPPLY("旧件返厂申请", ""), + ASOLDPARTRETURNAPPLY("旧件返厂申请", "process_6de5c2r8:1:10640004"), /******************************测试流程id*********************************************/