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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 1 year ago
parent
0fb8b00193 a948ca96f6
commit
835c586188
5 changed files with 120 additions and 104 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. 202
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
  2. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturninboundapply/LoanReturnInboundApply.java
  3. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java
  4. 12
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerService.java
  5. 2
      doc/databases/risk_center.sql

202
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
View File

@ -2163,122 +2163,120 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} //------------------推送抵押办理------------------------
//------------------推送抵押办理------------------------ try {
try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() .setNameFormat("demo-pool-%d").build();
.setNameFormat("demo-pool-%d").build(); ExecutorService pool = new ThreadPoolExecutor(2, 100,
ExecutorService pool = new ThreadPoolExecutor(2, 100, 0L, TimeUnit.MILLISECONDS,
0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); BusHandover mortgageHandover = busHandover;
BusHandover mortgageHandover = busHandover; Future future1 = pool.submit(() -> {
Future future1 = pool.submit(() -> { String orderSid = mortgageHandover.getOrderSid();
String orderSid = mortgageHandover.getOrderSid(); BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(orderSid);
BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(orderSid); String createBySid = "";
String createBySid = ""; String staff = "";
String staff = ""; String staffSid = "";
String staffSid = ""; String bankName = "";
String bankName = ""; String bankSid = "";
String bankSid = ""; String orgPath = "";
String orgPath = ""; String dept = "";
String dept = ""; String deptSid = "";
String deptSid = ""; if (null != salesOrder) {
if (null != salesOrder) { if (StringUtils.isNotBlank(salesOrder.getPayTypeKey())) {
if (StringUtils.isNotBlank(salesOrder.getPayTypeKey())) { if ("2".equals(salesOrder.getPayTypeKey())) {
if ("2".equals(salesOrder.getPayTypeKey())) { if (StringUtils.isNotBlank(salesOrder.getCreateBySid())) {
if (StringUtils.isNotBlank(salesOrder.getCreateBySid())) { createBySid = salesOrder.getCreateBySid();
createBySid = salesOrder.getCreateBySid(); }
} if (StringUtils.isNotBlank(salesOrder.getOrgSidPath())) {
if (StringUtils.isNotBlank(salesOrder.getOrgSidPath())) { orgPath = salesOrder.getOrgSidPath();
orgPath = salesOrder.getOrgSidPath(); }
} if (StringUtils.isNotBlank(salesOrder.getStaffSid())) {
if (StringUtils.isNotBlank(salesOrder.getStaffSid())) { staffSid = salesOrder.getStaffSid();
staffSid = salesOrder.getStaffSid(); }
} if (StringUtils.isNotBlank(salesOrder.getStaffName())) {
if (StringUtils.isNotBlank(salesOrder.getStaffName())) { staff = salesOrder.getStaffName();
staff = salesOrder.getStaffName(); }
} if (StringUtils.isNotBlank(salesOrder.getOrgName())) {
if (StringUtils.isNotBlank(salesOrder.getOrgName())) { dept = salesOrder.getOrgName();
dept = salesOrder.getOrgName(); }
} if (StringUtils.isNotBlank(salesOrder.getOrgSid())) {
if (StringUtils.isNotBlank(salesOrder.getOrgSid())) { deptSid = salesOrder.getOrgSid();
deptSid = salesOrder.getOrgSid(); }
} LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(orderSid).getData();
LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(orderSid).getData(); if (null != solutions) {
if (null != solutions) { if (StringUtils.isNotBlank(solutions.getPolicySid())) {
if (StringUtils.isNotBlank(solutions.getPolicySid())) { LoanFinPolicyVo policyVo = loanFinPolicyFeign.details(solutions.getPolicySid()).getData();
LoanFinPolicyVo policyVo = loanFinPolicyFeign.details(solutions.getPolicySid()).getData(); if (null != policyVo) {
if (null != policyVo) { if (StringUtils.isNotBlank(policyVo.getBankSid())) {
if (StringUtils.isNotBlank(policyVo.getBankSid())) { bankSid = policyVo.getBankSid();
bankSid = policyVo.getBankSid(); }
} if (StringUtils.isNotBlank(policyVo.getBankShortName())) {
if (StringUtils.isNotBlank(policyVo.getBankShortName())) { bankName = policyVo.getBankShortName();
bankName = policyVo.getBankShortName(); }
} }
} }
} }
} List<BusHandoverItems> vinItems = busHandoverItemsService.getItemsListByMainSid(mortgageHandover.getSid()).getData();
List<BusHandoverItems> vinItems = busHandoverItemsService.getItemsListByMainSid(mortgageHandover.getSid()).getData(); vinItems.removeAll(Collections.singleton(null));
vinItems.removeAll(Collections.singleton(null)); if (!vinItems.isEmpty()) {
if (!vinItems.isEmpty()) { vinItems = vinItems.stream().filter(obj -> obj.getVehivelOrTrailer().equals("主车")).collect(Collectors.toList());
vinItems = vinItems.stream().filter(obj -> obj.getVehivelOrTrailer().equals("主车")).collect(Collectors.toList()); for (BusHandoverItems vinItem : vinItems) {
for (BusHandoverItems vinItem : vinItems) { LoanMortgageInformationTransactDto mortagageDto = new LoanMortgageInformationTransactDto();
LoanMortgageInformationTransactDto mortagageDto = new LoanMortgageInformationTransactDto(); mortagageDto.setCreateBySid(createBySid);
mortagageDto.setCreateBySid(createBySid); mortagageDto.setOrgSidPath(orgPath);
mortagageDto.setOrgSidPath(orgPath); mortagageDto.setSalesOrderSid(orderSid);
mortagageDto.setSalesOrderSid(orderSid); mortagageDto.setBankName(bankName);
mortagageDto.setBankName(bankName); mortagageDto.setBankSid(bankSid);
mortagageDto.setBankSid(bankSid); mortagageDto.setDept(dept);
mortagageDto.setDept(dept); mortagageDto.setDeptSid(deptSid);
mortagageDto.setDeptSid(deptSid); mortagageDto.setStaffSid(staffSid);
mortagageDto.setStaffSid(staffSid); mortagageDto.setStaff(staff);
mortagageDto.setStaff(staff); if (StringUtils.isNotBlank(vinItem.getVinSid())) {
if (StringUtils.isNotBlank(vinItem.getVinSid())) { mortagageDto.setVehSid(vinItem.getVinSid());
mortagageDto.setVehSid(vinItem.getVinSid()); BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectOneByVehSidAndOrderSid(vinItem.getVinSid(), orderSid);
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectOneByVehSidAndOrderSid(vinItem.getVinSid(), orderSid); if (null != busSalesOrderVehicle) {
if (null != busSalesOrderVehicle) { if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) { String linkNo = busSalesOrderVehicle.getLinkNo();
String linkNo = busSalesOrderVehicle.getLinkNo(); if (linkNo.length() > 8) {
if (linkNo.length() > 8) { String substringLinkNo = linkNo.substring(linkNo.length() - 8);
String substringLinkNo = linkNo.substring(linkNo.length() - 8); mortagageDto.setVinNo(substringLinkNo);
mortagageDto.setVinNo(substringLinkNo); } else {
} else { mortagageDto.setVinNo(linkNo);
mortagageDto.setVinNo(linkNo); }
} }
} if (StringUtils.isNotBlank(busSalesOrderVehicle.getSid())) {
if (StringUtils.isNotBlank(busSalesOrderVehicle.getSid())) { mortagageDto.setBusVinSid(busSalesOrderVehicle.getSid());
mortagageDto.setBusVinSid(busSalesOrderVehicle.getSid()); }
} if (StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowerSid())) {
if (StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowerSid())) { mortagageDto.setBorrowerSid(busSalesOrderVehicle.getBorrowerSid());
mortagageDto.setBorrowerSid(busSalesOrderVehicle.getBorrowerSid()); }
} if (StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowName())) {
if (StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowName())) { mortagageDto.setBorrowerName(busSalesOrderVehicle.getBorrowName());
mortagageDto.setBorrowerName(busSalesOrderVehicle.getBorrowName()); }
} if (StringUtils.isNotBlank(busSalesOrderVehicle.getLoanContractSid())) {
if (StringUtils.isNotBlank(busSalesOrderVehicle.getLoanContractSid())) { mortagageDto.setLoanContractSid(busSalesOrderVehicle.getLoanContractSid());
mortagageDto.setLoanContractSid(busSalesOrderVehicle.getLoanContractSid()); BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractService.fetchBySid(busSalesOrderVehicle.getLoanContractSid());
BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractService.fetchBySid(busSalesOrderVehicle.getLoanContractSid()); if (null != loancontract) {
if (null != loancontract) { if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) { mortagageDto.setLoanContractNo(loancontract.getLoanContractNo());
mortagageDto.setLoanContractNo(loancontract.getLoanContractNo()); }
} }
} }
}
}
} }
loanMortgageInformationTransactFeign.saveMortgageInfo(mortagageDto);
} }
loanMortgageInformationTransactFeign.saveMortgageInfo(mortagageDto);
} }
} }
} }
} }
} });
}); } catch (Exception e) {
} catch (Exception e) { e.printStackTrace();
e.printStackTrace(); }
} }
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
} else { } else {
return rb.setMsg("操作失败!提交的数据不一致"); return rb.setMsg("操作失败!提交的数据不一致");

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturninboundapply/LoanReturnInboundApply.java
View File

@ -60,7 +60,7 @@ public class LoanReturnInboundApply extends BaseEntity {
@ApiModelProperty("停放地点sid") @ApiModelProperty("停放地点sid")
private String locationSid; private String locationSid;
@ApiModelProperty("停车收费标准") @ApiModelProperty("停车收费标准")
private BigDecimal parkFees; private String parkFees;
@ApiModelProperty("已还金额") @ApiModelProperty("已还金额")
private BigDecimal alRepaidMoney; private BigDecimal alRepaidMoney;
@ApiModelProperty("当前逾期金额") @ApiModelProperty("当前逾期金额")

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java
View File

@ -695,6 +695,12 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
QueryWrapper<LoanReturnInboundApply> qw = new QueryWrapper<>(); QueryWrapper<LoanReturnInboundApply> qw = new QueryWrapper<>();
List<String> busVinSid = new ArrayList<>(); List<String> busVinSid = new ArrayList<>();
if (query != null) { 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())) { if (StringUtils.isNotBlank(query.getOrgPath())) {
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
qw.eq("la.useOrgSid", useOrgSid); qw.eq("la.useOrgSid", useOrgSid);

12
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerService.java
View File

@ -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 {
}

2
doc/databases/risk_center.sql
View File

@ -1424,7 +1424,7 @@ CREATE TABLE `loan_return_inbound_apply`
`inboundMoney` int(32) DEFAULT NULL COMMENT '入库价', `inboundMoney` int(32) DEFAULT NULL COMMENT '入库价',
`locationName` varchar(64) DEFAULT NULL COMMENT '停放地点', `locationName` varchar(64) DEFAULT NULL COMMENT '停放地点',
`locationSid` varchar(64) DEFAULT NULL COMMENT '停放地点sid', `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 '已还金额', `alRepaidMoney` decimal(10, 0) DEFAULT NULL COMMENT '已还金额',
`currentBeMoney` decimal(10, 0) DEFAULT NULL COMMENT '当前逾期金额', `currentBeMoney` decimal(10, 0) DEFAULT NULL COMMENT '当前逾期金额',
`wheFundOccMoney` decimal(10, 0) DEFAULT NULL COMMENT '其中资金占用费', `wheFundOccMoney` decimal(10, 0) DEFAULT NULL COMMENT '其中资金占用费',

Write Preview
Loading…
Cancel
Save