diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java index f7b83d1e21..b9ef656b93 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java @@ -2163,122 +2163,120 @@ public class BusHandoverService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - BusHandover mortgageHandover = busHandover; - Future future1 = pool.submit(() -> { - String orderSid = mortgageHandover.getOrderSid(); - BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(orderSid); - String createBySid = ""; - String staff = ""; - String staffSid = ""; - String bankName = ""; - String bankSid = ""; - String orgPath = ""; - String dept = ""; - String deptSid = ""; - if (null != salesOrder) { - if (StringUtils.isNotBlank(salesOrder.getPayTypeKey())) { - if ("2".equals(salesOrder.getPayTypeKey())) { - if (StringUtils.isNotBlank(salesOrder.getCreateBySid())) { - createBySid = salesOrder.getCreateBySid(); - } - if (StringUtils.isNotBlank(salesOrder.getOrgSidPath())) { - orgPath = salesOrder.getOrgSidPath(); - } - if (StringUtils.isNotBlank(salesOrder.getStaffSid())) { - staffSid = salesOrder.getStaffSid(); - } - if (StringUtils.isNotBlank(salesOrder.getStaffName())) { - staff = salesOrder.getStaffName(); - } - if (StringUtils.isNotBlank(salesOrder.getOrgName())) { - dept = salesOrder.getOrgName(); - } - if (StringUtils.isNotBlank(salesOrder.getOrgSid())) { - deptSid = salesOrder.getOrgSid(); - } - LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(orderSid).getData(); - if (null != solutions) { - if (StringUtils.isNotBlank(solutions.getPolicySid())) { - LoanFinPolicyVo policyVo = loanFinPolicyFeign.details(solutions.getPolicySid()).getData(); - if (null != policyVo) { - if (StringUtils.isNotBlank(policyVo.getBankSid())) { - bankSid = policyVo.getBankSid(); - } - if (StringUtils.isNotBlank(policyVo.getBankShortName())) { - bankName = policyVo.getBankShortName(); + //------------------推送抵押办理------------------------ + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusHandover mortgageHandover = busHandover; + Future future1 = pool.submit(() -> { + String orderSid = mortgageHandover.getOrderSid(); + BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(orderSid); + String createBySid = ""; + String staff = ""; + String staffSid = ""; + String bankName = ""; + String bankSid = ""; + String orgPath = ""; + String dept = ""; + String deptSid = ""; + if (null != salesOrder) { + if (StringUtils.isNotBlank(salesOrder.getPayTypeKey())) { + if ("2".equals(salesOrder.getPayTypeKey())) { + if (StringUtils.isNotBlank(salesOrder.getCreateBySid())) { + createBySid = salesOrder.getCreateBySid(); + } + if (StringUtils.isNotBlank(salesOrder.getOrgSidPath())) { + orgPath = salesOrder.getOrgSidPath(); + } + if (StringUtils.isNotBlank(salesOrder.getStaffSid())) { + staffSid = salesOrder.getStaffSid(); + } + if (StringUtils.isNotBlank(salesOrder.getStaffName())) { + staff = salesOrder.getStaffName(); + } + if (StringUtils.isNotBlank(salesOrder.getOrgName())) { + dept = salesOrder.getOrgName(); + } + if (StringUtils.isNotBlank(salesOrder.getOrgSid())) { + deptSid = salesOrder.getOrgSid(); + } + LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(orderSid).getData(); + if (null != solutions) { + if (StringUtils.isNotBlank(solutions.getPolicySid())) { + LoanFinPolicyVo policyVo = loanFinPolicyFeign.details(solutions.getPolicySid()).getData(); + if (null != policyVo) { + if (StringUtils.isNotBlank(policyVo.getBankSid())) { + bankSid = policyVo.getBankSid(); + } + if (StringUtils.isNotBlank(policyVo.getBankShortName())) { + bankName = policyVo.getBankShortName(); + } } } } - } - List vinItems = busHandoverItemsService.getItemsListByMainSid(mortgageHandover.getSid()).getData(); - vinItems.removeAll(Collections.singleton(null)); - if (!vinItems.isEmpty()) { - vinItems = vinItems.stream().filter(obj -> obj.getVehivelOrTrailer().equals("主车")).collect(Collectors.toList()); - for (BusHandoverItems vinItem : vinItems) { - LoanMortgageInformationTransactDto mortagageDto = new LoanMortgageInformationTransactDto(); - mortagageDto.setCreateBySid(createBySid); - mortagageDto.setOrgSidPath(orgPath); - mortagageDto.setSalesOrderSid(orderSid); - mortagageDto.setBankName(bankName); - mortagageDto.setBankSid(bankSid); - mortagageDto.setDept(dept); - mortagageDto.setDeptSid(deptSid); - mortagageDto.setStaffSid(staffSid); - mortagageDto.setStaff(staff); - if (StringUtils.isNotBlank(vinItem.getVinSid())) { - mortagageDto.setVehSid(vinItem.getVinSid()); - BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectOneByVehSidAndOrderSid(vinItem.getVinSid(), orderSid); - if (null != busSalesOrderVehicle) { - if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) { - String linkNo = busSalesOrderVehicle.getLinkNo(); - if (linkNo.length() > 8) { - String substringLinkNo = linkNo.substring(linkNo.length() - 8); - mortagageDto.setVinNo(substringLinkNo); - } else { - mortagageDto.setVinNo(linkNo); + List vinItems = busHandoverItemsService.getItemsListByMainSid(mortgageHandover.getSid()).getData(); + vinItems.removeAll(Collections.singleton(null)); + if (!vinItems.isEmpty()) { + vinItems = vinItems.stream().filter(obj -> obj.getVehivelOrTrailer().equals("主车")).collect(Collectors.toList()); + for (BusHandoverItems vinItem : vinItems) { + LoanMortgageInformationTransactDto mortagageDto = new LoanMortgageInformationTransactDto(); + mortagageDto.setCreateBySid(createBySid); + mortagageDto.setOrgSidPath(orgPath); + mortagageDto.setSalesOrderSid(orderSid); + mortagageDto.setBankName(bankName); + mortagageDto.setBankSid(bankSid); + mortagageDto.setDept(dept); + mortagageDto.setDeptSid(deptSid); + mortagageDto.setStaffSid(staffSid); + mortagageDto.setStaff(staff); + if (StringUtils.isNotBlank(vinItem.getVinSid())) { + mortagageDto.setVehSid(vinItem.getVinSid()); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectOneByVehSidAndOrderSid(vinItem.getVinSid(), orderSid); + if (null != busSalesOrderVehicle) { + if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) { + String linkNo = busSalesOrderVehicle.getLinkNo(); + if (linkNo.length() > 8) { + String substringLinkNo = linkNo.substring(linkNo.length() - 8); + mortagageDto.setVinNo(substringLinkNo); + } else { + mortagageDto.setVinNo(linkNo); + } } - } - if (StringUtils.isNotBlank(busSalesOrderVehicle.getSid())) { - mortagageDto.setBusVinSid(busSalesOrderVehicle.getSid()); - } - if (StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowerSid())) { - mortagageDto.setBorrowerSid(busSalesOrderVehicle.getBorrowerSid()); - } - if (StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowName())) { - mortagageDto.setBorrowerName(busSalesOrderVehicle.getBorrowName()); - } - if (StringUtils.isNotBlank(busSalesOrderVehicle.getLoanContractSid())) { - mortagageDto.setLoanContractSid(busSalesOrderVehicle.getLoanContractSid()); - BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractService.fetchBySid(busSalesOrderVehicle.getLoanContractSid()); - if (null != loancontract) { - if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) { - mortagageDto.setLoanContractNo(loancontract.getLoanContractNo()); + if (StringUtils.isNotBlank(busSalesOrderVehicle.getSid())) { + mortagageDto.setBusVinSid(busSalesOrderVehicle.getSid()); + } + if (StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowerSid())) { + mortagageDto.setBorrowerSid(busSalesOrderVehicle.getBorrowerSid()); + } + if (StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowName())) { + mortagageDto.setBorrowerName(busSalesOrderVehicle.getBorrowName()); + } + if (StringUtils.isNotBlank(busSalesOrderVehicle.getLoanContractSid())) { + mortagageDto.setLoanContractSid(busSalesOrderVehicle.getLoanContractSid()); + BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractService.fetchBySid(busSalesOrderVehicle.getLoanContractSid()); + if (null != loancontract) { + if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) { + mortagageDto.setLoanContractNo(loancontract.getLoanContractNo()); + } } } - } + } } + loanMortgageInformationTransactFeign.saveMortgageInfo(mortagageDto); } - loanMortgageInformationTransactFeign.saveMortgageInfo(mortagageDto); } } - } } - } - }); - } catch (Exception e) { - e.printStackTrace(); + }); + } catch (Exception e) { + e.printStackTrace(); + } } - return rb.success().setData(resultBean.getData()); } else { return rb.setMsg("操作失败!提交的数据不一致"); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturninboundapply/LoanReturnInboundApply.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturninboundapply/LoanReturnInboundApply.java index 6d1fdeb845..455888d0b5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturninboundapply/LoanReturnInboundApply.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturninboundapply/LoanReturnInboundApply.java @@ -60,7 +60,7 @@ public class LoanReturnInboundApply extends BaseEntity { @ApiModelProperty("停放地点sid") private String locationSid; @ApiModelProperty("停车收费标准") - private BigDecimal parkFees; + private String parkFees; @ApiModelProperty("已还金额") private BigDecimal alRepaidMoney; @ApiModelProperty("当前逾期金额") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java index f7c3b842a0..9d07b635df 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java @@ -695,6 +695,12 @@ public class LoanReturnInboundApplyService extends MybatisBaseService qw = new QueryWrapper<>(); List busVinSid = new ArrayList<>(); if (query != null) { + if(StringUtils.isNotBlank(query.getVinNo())){ + qw.like("la.vinNo",query.getVinNo()); + } + if(StringUtils.isNotBlank(query.getVehMark())){ + qw.like("la.carNum",query.getVehMark()); + } if (StringUtils.isNotBlank(query.getOrgPath())) { String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); qw.eq("la.useOrgSid", useOrgSid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerService.java new file mode 100644 index 0000000000..fbffb79f08 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerService.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.riskcenter.biz.loanreturnvehledger; + +import org.springframework.stereotype.Service; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/19 + **/ +@Service +public class LoanReturnVehLedgerService { +} diff --git a/doc/databases/risk_center.sql b/doc/databases/risk_center.sql index a7467541a5..10eb4950c4 100644 --- a/doc/databases/risk_center.sql +++ b/doc/databases/risk_center.sql @@ -1424,7 +1424,7 @@ CREATE TABLE `loan_return_inbound_apply` `inboundMoney` int(32) DEFAULT NULL COMMENT '入库价', `locationName` varchar(64) DEFAULT NULL COMMENT '停放地点', `locationSid` varchar(64) DEFAULT NULL COMMENT '停放地点sid', - `parkFees` decimal(10, 0) DEFAULT NULL COMMENT '停车收费标准', + `parkFees` varchar(500) DEFAULT NULL COMMENT '停车收费标准', `alRepaidMoney` decimal(10, 0) DEFAULT NULL COMMENT '已还金额', `currentBeMoney` decimal(10, 0) DEFAULT NULL COMMENT '当前逾期金额', `wheFundOccMoney` decimal(10, 0) DEFAULT NULL COMMENT '其中资金占用费',