Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 5 days ago
parent
commit
e72f80c5da
  1. 92
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
  2. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java
  3. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java
  4. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java
  5. 15
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java
  6. 84
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.xml
  7. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java

92
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

@ -147,7 +147,8 @@
) AS beOverdueMoneyAndPeriod,
a1.busVinSid AS saleVehSid,
MAX(a1.salesOrderSid) AS salesOrderSid,
MAX(a1.lockCarState) AS lockCarState
MAX(a1.lockCarState) AS lockCarState,
a1.nowOverdue
FROM (
SELECT
lrpd.sid,
@ -168,7 +169,8 @@
ct.mobile,
lrpd.borrowerSid,
lrpd.salesOrderSid,
lbcv_agg.lockCarState
lbcv_agg.lockCarState,
if(lrpd.dueDate <= lrpd.updateTime,0,1) as nowOverdue
FROM
loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh
@ -233,6 +235,7 @@
) a1
WHERE
a1.borrowerSid = #{borrowerSid}
AND a1.nowOverdue = 0
GROUP BY
a1.loanContractNo,
a1.vinNo,
@ -283,7 +286,8 @@
MAX(a1.reaRepaymentName) AS repaymentName,
MAX(a1.createTime) AS createTime,
a1.orgSidPath,
MAX(a1.lockCarState) AS lockCarState -- 保证聚合正确性
MAX(a1.lockCarState) AS lockCarState, -- 保证聚合正确性
a1.nowOverdue
FROM (
SELECT
lrpd.sid,
@ -313,87 +317,7 @@
WHEN 2 THEN '控制失败'
WHEN 3 THEN '已解控'
END AS lockCarState,
CASE
WHEN lrpd.dueDate > lrpd.updateTime or lrpd.updateTime IS NULL THEN '1'
WHEN lrpd.dueDate <= lrpd.updateTime AND (IFNULL(
(
lrpd.dueMoney - IFNULL((
SELECT
SUM(
IFNULL( lrh.actualMoney, 0 ))
FROM
loan_repayment_history AS lrh
WHERE
lrh.planDetailSid = lrpd.sid
AND lrh.updateState = '1'
),
0
)),
0
) + IFNULL((
SELECT
( fjj.reveivableMoney - fjj.m )
FROM
(
SELECT
IFNULL((
SELECT
SUM( subscriptionMoney )
FROM
anrui_fin.fin_selected_receivables_detailed AS s
WHERE
s.auditState = '3'
AND s.receivablesSid = fj.sid
),
0
) AS m,
fj.*
FROM
( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj
) AS fjj
WHERE
fjj.busSid = lrpd.sid
),0) + IFNULL(lrpd.paymentInterest,0)) > 0 THEN '0'
WHEN lrpd.dueDate <= lrpd.updateTime AND (IFNULL(
(
lrpd.dueMoney - IFNULL((
SELECT
SUM(
IFNULL( lrh.actualMoney, 0 ))
FROM
loan_repayment_history AS lrh
WHERE
lrh.planDetailSid = lrpd.sid
AND lrh.updateState = '1'
),
0
)),
0
) + IFNULL((
SELECT
( fjj.reveivableMoney - fjj.m )
FROM
(
SELECT
IFNULL((
SELECT
SUM( subscriptionMoney )
FROM
anrui_fin.fin_selected_receivables_detailed AS s
WHERE
s.auditState = '3'
AND s.receivablesSid = fj.sid
),
0
) AS m,
fj.*
FROM
( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj
) AS fjj
WHERE
fjj.busSid = lrpd.sid
),0) + IFNULL(lrpd.paymentInterest,0)) <= 0 THEN '1'
END AS nowOverdue
if(lrpd.dueDate <= lrpd.updateTime,0,1) as nowOverdue
FROM loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh
ON lrh.planDetailSid = lrpd.sid

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java

@ -164,6 +164,7 @@ public class LoanBeOverdueVehService {
if (StringUtils.isNotBlank(query.getNames())) {
qw.and(wrapper -> wrapper.like("a1.loanContractNo", query.getNames()).or().like("a1.borrowerName", query.getNames()).or().like("a1.vinNo", query.getNames()));
}
qw.eq("a1.nowOverdue", "0");
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (a1.createTime,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
@ -283,6 +284,7 @@ public class LoanBeOverdueVehService {
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("a1.vinNo", query.getVinNo());
}
qw.eq("a1.nowOverdue", "0");
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (a1.createTime,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java

@ -223,7 +223,7 @@ public class LoanLawsuitApplyService extends MybatisBaseService<LoanLawsuitApply
}
for (LoanLawsuitVehVo veh : vehList) {
String busVinSid = veh.getBusVinSid();
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(busVinSid);
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr2(busVinSid);
if (null != alrepaidAndArr) {
//已还金额
if (StringUtils.isNotBlank(alrepaidAndArr.getAlRepaidMoney())) {

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java

@ -271,7 +271,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
if (StringUtils.isNotBlank(rkSid)) {
vo.setRksqSid(rkSid);
}
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(redemptionInitVo.getBusVinSid());
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr2(redemptionInitVo.getBusVinSid());
if (null != alrepaidAndArr) {
//已还金额
if (StringUtils.isNotBlank(alrepaidAndArr.getAlRepaidMoney())) {
@ -500,7 +500,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
if (StringUtils.isNotBlank(rkSid)) {
vo.setRksqSid(rkSid);
}
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(vo.getBusVinSid());
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr2(vo.getBusVinSid());
if (null != alrepaidAndArr) {
//已还金额
if (StringUtils.isNotBlank(alrepaidAndArr.getAlRepaidMoney())) {
@ -1215,7 +1215,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
if (StringUtils.isNotBlank(rkSid)) {
vo.setRksqSid(rkSid);
}
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(vo.getCsjlSid());
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr2(vo.getCsjlSid());
if (null != alrepaidAndArr) {
String allPeriod = "";
String nowBeMoney = "";

15
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java

@ -87,19 +87,6 @@ import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
/**
* Project: anrui-riskcenter(车辆交回事前报备申请) <br/>
* File: LoanRestoreReportApplyService.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService <br/>
* Description: 车辆交回事前报备申请 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-01-08 11:43:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestoreReportApplyMapper, LoanRestoreReportApply> {
@ -351,7 +338,7 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrderVehicle.getSalesOrderSid());
loanRestoreReportApplyDetailsVo.setJrfaSid(loanSolutions.getSid());
loanRestoreReportApplyDetailsVo.setSaleVehSid(saleVehSid);
AlrepaidAndArrVo alrepaidAndArr = getAlrepaidAndArr(saleVehSid);
AlrepaidAndArrVo alrepaidAndArr = getAlrepaidAndArr2(saleVehSid);
loanRestoreReportApplyDetailsVo.setAlRepaidMoney(alrepaidAndArr.getAlRepaidMoney());
loanRestoreReportApplyDetailsVo.setCurrentBeMoney(alrepaidAndArr.getCurrentBeMoney());
loanRestoreReportApplyDetailsVo.setWheFundOccMoney(alrepaidAndArr.getWheFundOccMoney());

84
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.xml

@ -37,7 +37,7 @@
lv.borrowerName
FROM loan_be_collection_veh lv
LEFT JOIN loan_be_collection_apply la
ON lv.`mainSid` = la.`sid`
ON lv.mainSid = la.sid
<where>
${ew.sqlSegment}
</where>
@ -68,83 +68,37 @@
<select id="initVehListBySaleVehSidYCJK"
resultType="com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehInit">
SELECT
a1.`loanContractNo`,
a1.loanContractNo,
RIGHT (a1.vinNo, 8) AS vinNo,
a1.vehMark AS carNum,
a1.`bankName`,
a1.bankName,
a1.bankContractNo,
a1.customer AS custName,
a1.borrowerName AS loanName,
a1.dueDate AS firstBeDate,
COUNT(a1.sid) AS beOverduePeriod,
(
SUM(a1.yq_total) + IFNULL(
(SELECT
SUM(lbpv.`bankBeInter`)
FROM
loan_be_padsincere_veh lbpv
WHERE lbpv.saleVehSid = a1.busVinSid),
0
) + IFNULL(
(SELECT
SUM(fund)
FROM
loan_fund_day
WHERE busSid IN
(SELECT
lrpd.sid
FROM
loan_repayment_plan_details lrpd
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE())),
0
)
) AS beOverdueMoney,
ROUND(
(
SUM(a1.yq_total) + IFNULL(
(SELECT
SUM(lbpv.`bankBeInter`)
FROM
loan_be_padsincere_veh lbpv
WHERE lbpv.saleVehSid = a1.busVinSid),
0
) + IFNULL(
(SELECT
SUM(fund)
FROM
loan_fund_day
WHERE busSid IN
(SELECT
lrpd.sid
FROM
loan_repayment_plan_details lrpd
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE())),
0
)
) / a1.dueMoney,
1
) AS beOverdueMoneyAndPeriod,
a1.busVinSid AS saleVehSid,
a1.salesOrderSid,
a1.lockCarMoney
a1.lockCarMoney,
a1.nowOverdue
FROM
(SELECT
lrpd.sid,
lrpd.busVinSid,
lrpd.`loanContractNo`,
lrpd.loanContractNo,
lrpd.bankContractNo,
lrpd.`vinNo`,
lrpd.`bankName`,
lrpd.vinNo,
lrpd.bankName,
lrpd.borrowerName,
lrpd.dueDate,
lrpd.vehMark,
lrpd.dueMoney,
(
lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))
) AS yq_total,
(
lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
) / lrpd.`dueMoney` AS yq_hsqs,
lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))
) / lrpd.dueMoney AS yq_hsqs,
lrpd.customer,
ct.mobile,
lr.createTime,
@ -161,12 +115,13 @@
AND lbcv.lockCarState = '1'
AND lbcv.saleVehSid = lrpd.busVinSid
ORDER BY lbcv.createTime DESC
LIMIT 1) AS lockCarMoney
LIMIT 1) AS lockCarMoney,
if(lrpd.dueDate &lt;= lrpd.updateTime,0,1) as nowOverdue
FROM
`loan_repayment_plan_details` lrpd
LEFT JOIN `loan_repayment_history` lrh
ON lrh.planDetailSid = lrpd.`sid`
LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv
loan_repayment_plan_details lrpd
LEFT JOIN loan_repayment_history lrh
ON lrh.planDetailSid = lrpd.sid
LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv
ON lrpd.busVinSid = bv.sid
LEFT JOIN
(SELECT
@ -177,12 +132,13 @@
ORDER BY createTime DESC
LIMIT 1) lr
ON lrpd.busVinSid = lr.saleVehSid
LEFT JOIN anrui_crm.`crm_customer_temp` ct
LEFT JOIN anrui_crm.crm_customer_temp ct
ON lrpd.customerSid = ct.sid
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
GROUP BY lrpd.`sid`
GROUP BY lrpd.sid
HAVING (yq_total > 0)) a1
WHERE a1.busVinSid = #{saleVehSid}
AND a1.nowOverdue = 0
GROUP BY a1.loanContractNo,
a1.vinNo,
a1.busVinSid

7
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java

@ -57,6 +57,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.*;
import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.flowable.*;
@ -64,6 +65,7 @@ import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.*;
import com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehService;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
import com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehService;
import com.yxt.common.base.config.component.FileUploadComponent;
@ -99,6 +101,8 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
@Autowired
private LoanVehClearanceVehService loanVehClearanceVehService;
@Autowired
private LoanRestoreReportApplyService loanRestoreReportApplyService;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@ -392,6 +396,9 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
LoanVehClearanceVehInit loanVehClearanceVehInit = baseMapper.initVehListBySaleVehSidYCJK(saleVehSid);
LoanVehClearanceVehDetailsVo loanVehClearanceVehDetailsVo = new LoanVehClearanceVehDetailsVo();
BeanUtil.copyProperties(loanVehClearanceVehInit, loanVehClearanceVehDetailsVo);
AlrepaidAndArrVo alrepaidAndArr2 = loanRestoreReportApplyService.getAlrepaidAndArr2(saleVehSid);
loanVehClearanceVehDetailsVo.setBeOverdueMoney(alrepaidAndArr2.getCurrentBeMoney());
loanVehClearanceVehDetailsVo.setBeOverdueMoneyAndPeriod(alrepaidAndArr2.getBeOverdueMoneyAndPeriod());
loanVehClearanceVehDetailsVo.setCustomerName(loanVehClearanceVehInit.getCustName());
loanVehClearanceVehDetailsVo.setBorrowerName(loanVehClearanceVehInit.getLoanName());
List<LoanVehClearanceVehFile> loanVehClearanceVehFiles = new ArrayList<>();

Loading…
Cancel
Save