Browse Source

优化

master
God 1 year ago
parent
commit
6d9b925de1
  1. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java
  2. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBePadsincereApplyDetailsVo.java
  3. 10
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBePadsincereVehDetailsVo.java
  4. 9
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java
  5. 25
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/flowable/AppBeCollectionDelegateQuery.java
  6. 10
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionRest.java
  7. 63
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java

@ -378,7 +378,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData();
LoanBeCollectionVehFile loanBeCollectionVehFile2 = new LoanBeCollectionVehFile();
loanBeCollectionVehFile2.setName("开票信息");
//loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
loanBeCollectionVehFiles.add(loanBeCollectionVehFile2);
//月还明细sid
LoanBeCollectionVehFile loanBeCollectionVehFile3 = new LoanBeCollectionVehFile();
@ -389,7 +389,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrder.getSid());
LoanBeCollectionVehFile loanBeCollectionVehFile4 = new LoanBeCollectionVehFile();
loanBeCollectionVehFile4.setName("金融方案");
//loanBeCollectionVehFile4.setSid(loanSolutions.getSid());
loanBeCollectionVehFile4.setSid(loanSolutions.getSid());
loanBeCollectionVehFiles.add(loanBeCollectionVehFile4);
//家访考察报告sid
String jfkcSid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle1.getBorrowerSid());
@ -440,7 +440,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData();
LoanBeCollectionVehFile loanBeCollectionVehFile2 = new LoanBeCollectionVehFile();
loanBeCollectionVehFile2.setName("开票信息");
//loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
loanBeCollectionVehFiles.add(loanBeCollectionVehFile2);
//月还明细sid
LoanBeCollectionVehFile loanBeCollectionVehFile3 = new LoanBeCollectionVehFile();

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBePadsincereApplyDetailsVo.java

@ -70,6 +70,9 @@ public class AppBePadsincereApplyDetailsVo implements Vo {
@ApiModelProperty("流程实例的sid")
private String procInsId;
@ApiModelProperty("金额合计")
private String totalAmount;
@ApiModelProperty("垫款车辆列表")
private List<AppBePadsincereVehDetailsVo> records = new ArrayList<>();
}

10
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBePadsincereVehDetailsVo.java

@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-riskcenter(垫款申请) <br/>
* File: LoanBePadsincereVehVo.java <br/>
@ -63,13 +65,13 @@ public class AppBePadsincereVehDetailsVo implements Vo {
@ApiModelProperty("期数")
private String instalments;
@ApiModelProperty("系统逾期金额")
private String sysBeMoney;
private BigDecimal sysBeMoney;
@ApiModelProperty("资方逾期金额")
private String bankBeMoney;
private BigDecimal bankBeMoney;
@ApiModelProperty("资方逾期罚息")
private String bankBeInter;
private BigDecimal bankBeInter;
@ApiModelProperty("垫款金额")
private String padMoney;
private BigDecimal padMoney;
@ApiModelProperty("付款账户")
private String paymentAccount;
@ApiModelProperty("付款账号")

9
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java

@ -1,6 +1,7 @@
package com.yxt.anrui.terminal.api.risk.becollection;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.AppOrderDelegateQuery;
import com.yxt.anrui.terminal.api.risk.becollection.flowable.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -83,6 +84,10 @@ public interface BeCollectionFeign {
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap BeCollectionQuery query);
@ApiOperation(value = "加签")
@PutMapping(value = "/delegate")
@ResponseBody
public ResultBean delegate(@RequestBody AppBeCollectionDelegateQuery delegateQuery);
/****************************************垫款流程审批******************************************/
@ApiOperation("办理")
@ -110,4 +115,8 @@ public interface BeCollectionFeign {
@ResponseBody
ResultBean<String> getFlowOperateTitlePad(@SpringQueryMap BeCollectionQuery query);
@ApiOperation(value = "加签")
@PutMapping(value = "/delegatePad")
@ResponseBody
public ResultBean delegatePad(@RequestBody AppBeCollectionDelegateQuery delegateQuery);
}

25
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/flowable/AppBeCollectionDelegateQuery.java

@ -0,0 +1,25 @@
package com.yxt.anrui.terminal.api.risk.becollection.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/28 10:16
*/
@Data
public class AppBeCollectionDelegateQuery {
@ApiModelProperty
private String userSid;
@ApiModelProperty("流程实例id")
@JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty("任务Id")
private String taskId;
@ApiModelProperty("审批人sid")
private String assignee;
@ApiModelProperty("填写意见")
private String views;
}

10
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionRest.java

@ -106,6 +106,11 @@ public class BeCollectionRest implements BeCollectionFeign {
return beCollectionService.getFlowOperateTitle(query);
}
@Override
public ResultBean delegate(AppBeCollectionDelegateQuery delegateQuery) {
return beCollectionService.delegate(delegateQuery);
}
@Override
public ResultBean agreeCreditInfoPad(CompleteBeCollectionDto dto) {
return beCollectionService.agreeCreditInfoPad(dto);
@ -130,4 +135,9 @@ public class BeCollectionRest implements BeCollectionFeign {
public ResultBean<String> getFlowOperateTitlePad(BeCollectionQuery query) {
return beCollectionService.getFlowOperateTitlePad(query);
}
@Override
public ResultBean delegatePad(AppBeCollectionDelegateQuery delegateQuery) {
return beCollectionService.delegatePad(delegateQuery);
}
}

63
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java

@ -29,8 +29,10 @@ package com.yxt.anrui.terminal.biz.risk.becollection;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.ReaRepaymentDto;
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@ -65,6 +67,7 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@ -159,6 +162,15 @@ public class BeCollectionService {
return rb.success().setData(data);
}
public ResultBean delegate(AppBeCollectionDelegateQuery delegateQuery) {
ResultBean rb = ResultBean.fireFail();
LoanBeCollectionApplyDelegateQuery delegateQuery1 = new
LoanBeCollectionApplyDelegateQuery();
BeanUtil.copyProperties(delegateQuery, delegateQuery1);
loanBeCollectionApplyFeign.delegate(delegateQuery1);
return rb.success();
}
/******************************************************************************************************************************************/
public ResultBean agreeCreditInfoPad(CompleteBeCollectionDto dto) {
@ -231,6 +243,15 @@ public class BeCollectionService {
return rb.success().setData(data);
}
public ResultBean delegatePad(AppBeCollectionDelegateQuery delegateQuery) {
ResultBean rb = ResultBean.fireFail();
LoanBePadsincereDelegateQuery delegateQuery1 = new
LoanBePadsincereDelegateQuery();
BeanUtil.copyProperties(delegateQuery, delegateQuery1);
loanBePadsincereApplyFeign.delegate(delegateQuery1);
return rb.success();
}
/******************************************************************************************************************************************/
public ResultBean<AppBeCollectionApplyDetailsVo> collectionDetail(String sid) {
@ -250,7 +271,7 @@ public class BeCollectionService {
appBeCollectionApplyDetailsVo.setProcInsId(loanBeCollectionApplyDetailsVo.getProcInstSid());
List<LoanBeCollectionFileVo> files = loanBeCollectionApplyDetailsVo.getFiles();
List<String> fj = new ArrayList<>();
if (files != null && files.size() > 0){
if (files != null && files.size() > 0) {
for (LoanBeCollectionFileVo file : files) {
fj.add(file.getUrl());
}
@ -274,7 +295,7 @@ public class BeCollectionService {
appBeCollectionVehDetailsVo.setBeOverdueMoneyAndPeriod(loanBeCollectionVehDetail.getBeOverdueMoneyAndPeriod());
List<LoanBeCollectionFileVo> hkxyFiles = loanBeCollectionVehDetail.getHkxyFiles();
ArrayList<String> appHkxys = new ArrayList<>();
if (hkxyFiles != null && hkxyFiles.size() > 0){
if (hkxyFiles != null && hkxyFiles.size() > 0) {
for (LoanBeCollectionFileVo hkxyFile : hkxyFiles) {
appHkxys.add(hkxyFile.getUrl());
}
@ -282,19 +303,19 @@ public class BeCollectionService {
appBeCollectionVehDetailsVo.setAppHkxy(appHkxys);
List<LoanBeCollectionVehFile> sids = loanBeCollectionVehDetail.getSids();
for (LoanBeCollectionVehFile loanBeCollectionVehFile : sids) {
if ("催收记录".equals(loanBeCollectionVehFile.getName())){
if ("催收记录".equals(loanBeCollectionVehFile.getName())) {
appBeCollectionVehDetailsVo.setCsjlSid(loanBeCollectionVehFile.getSid());
}
if ("开票信息".equals(loanBeCollectionVehFile.getName())){
if ("开票信息".equals(loanBeCollectionVehFile.getName())) {
appBeCollectionVehDetailsVo.setKpglSid(loanBeCollectionVehFile.getSid());
}
if ("月还明细".equals(loanBeCollectionVehFile.getName())){
if ("月还明细".equals(loanBeCollectionVehFile.getName())) {
appBeCollectionVehDetailsVo.setYhmxSid(loanBeCollectionVehFile.getSid());
}
if ("金融方案".equals(loanBeCollectionVehFile.getName())){
if ("金融方案".equals(loanBeCollectionVehFile.getName())) {
appBeCollectionVehDetailsVo.setJrfaSid(loanBeCollectionVehFile.getSid());
}
if ("家访考察报告".equals(loanBeCollectionVehFile.getName())){
if ("家访考察报告".equals(loanBeCollectionVehFile.getName())) {
appBeCollectionVehDetailsVo.setJfkcSid(loanBeCollectionVehFile.getSid());
}
}
@ -317,7 +338,7 @@ public class BeCollectionService {
appBePadsincereApplyDetailsVo.setProcInsId(loanBePadsincereApplyDetailsVo.getProcInstSid());
List<LoanBePadsincereFile> fileUrlList = loanBePadsincereApplyDetailsVo.getFileUrlList();
List<String> fj = new ArrayList<>();
if (fileUrlList != null && fileUrlList.size() > 0){
if (fileUrlList != null && fileUrlList.size() > 0) {
for (LoanBePadsincereFile file : fileUrlList) {
fj.add(file.getUrl());
}
@ -334,10 +355,10 @@ public class BeCollectionService {
appBePadsincereVehDetailsVo.setCusName(loanBePadsincereVehDetailsVo.getCustomerName());
appBePadsincereVehDetailsVo.setLoanName(loanBePadsincereVehDetailsVo.getBorrowerName());
appBePadsincereVehDetailsVo.setInstalments("期數:" + loanBePadsincereVehDetailsVo.getPeriod());
appBePadsincereVehDetailsVo.setSysBeMoney(loanBePadsincereVehDetailsVo.getSysBeMoney());
appBePadsincereVehDetailsVo.setBankBeMoney(loanBePadsincereVehDetailsVo.getBankBeMoney());
appBePadsincereVehDetailsVo.setBankBeInter(loanBePadsincereVehDetailsVo.getBankBeInter());
appBePadsincereVehDetailsVo.setPadMoney(loanBePadsincereVehDetailsVo.getPadMoney());
appBePadsincereVehDetailsVo.setSysBeMoney(new BigDecimal(loanBePadsincereVehDetailsVo.getSysBeMoney()));
appBePadsincereVehDetailsVo.setBankBeMoney(new BigDecimal(loanBePadsincereVehDetailsVo.getBankBeMoney()));
appBePadsincereVehDetailsVo.setBankBeInter(new BigDecimal(loanBePadsincereVehDetailsVo.getBankBeInter()));
appBePadsincereVehDetailsVo.setPadMoney(new BigDecimal(loanBePadsincereVehDetailsVo.getPadMoney()));
appBePadsincereVehDetailsVo.setPaymentAccount(loanBePadsincereVehDetailsVo.getPaymentAccount());
appBePadsincereVehDetailsVo.setPaymentNum(loanBePadsincereVehDetailsVo.getPaymentNum());
appBePadsincereVehDetailsVo.setBankCollectionAcc(loanBePadsincereVehDetailsVo.getBankCollectionAcc());
@ -346,6 +367,16 @@ public class BeCollectionService {
appBePadsincereVehDetailsVos.add(appBePadsincereVehDetailsVo);
}
appBePadsincereApplyDetailsVo.setRecords(appBePadsincereVehDetailsVos);
//平台逾期月还合计
BigDecimal ptyqyhTotal = appBePadsincereVehDetailsVos.stream().map(AppBePadsincereVehDetailsVo::getSysBeMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
//资方逾期月还合计
BigDecimal zfyqyhTotal = appBePadsincereVehDetailsVos.stream().map(AppBePadsincereVehDetailsVo::getBankBeMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
//资方逾期利息合计
BigDecimal zfyqlxTotal = appBePadsincereVehDetailsVos.stream().map(AppBePadsincereVehDetailsVo::getBankBeInter).reduce(BigDecimal.ZERO, BigDecimal::add);
//垫款金额合计
BigDecimal dkjeTotal = appBePadsincereVehDetailsVos.stream().map(AppBePadsincereVehDetailsVo::getPadMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
String totalAmount = "平台逾期月还合计:" + ptyqyhTotal.toString() + ",资方逾期月还合计:" + zfyqyhTotal.toString() + ",资方逾期利息合计:" + zfyqlxTotal.toString() + ",垫款金额合计:" + dkjeTotal.toString();
appBePadsincereApplyDetailsVo.setTotalAmount(totalAmount);
return rb.success().setData(appBePadsincereApplyDetailsVo);
}
@ -390,14 +421,14 @@ public class BeCollectionService {
ResultBean rb = ResultBean.fireFail();
ReaRepaymentVo reaRepaymentVo = loanBeOverdueVehFegin.initReaRepayment(saleVehSid).getData();
AppReaRepaymentVo appReaRepaymentVo = new AppReaRepaymentVo();
BeanUtil.copyProperties(reaRepaymentVo,appReaRepaymentVo);
BeanUtil.copyProperties(reaRepaymentVo, appReaRepaymentVo);
return rb.success().setData(appReaRepaymentVo);
}
public ResultBean maintReaRepayment(AppReaRepaymentDto appReaRepaymentDto) {
ResultBean rb = ResultBean.fireFail();
ReaRepaymentDto reaRepaymentDto = new ReaRepaymentDto();
BeanUtil.copyProperties(appReaRepaymentDto,reaRepaymentDto);
BeanUtil.copyProperties(appReaRepaymentDto, reaRepaymentDto);
busSalesOrderVehicleFeign.maintReaRepayment(reaRepaymentDto);
return rb.success();
}
@ -406,7 +437,7 @@ public class BeCollectionService {
ResultBean rb = ResultBean.fireFail();
LoanBeCollectionRecordInit loanBeCollectionRecordInit = loanBeCollectionRecordFeign.init(saleVehSid).getData();
AppBeCollectionRecordInit appBeCollectionRecordInit = new AppBeCollectionRecordInit();
BeanUtil.copyProperties(loanBeCollectionRecordInit,appBeCollectionRecordInit);
BeanUtil.copyProperties(loanBeCollectionRecordInit, appBeCollectionRecordInit);
List<LoanBeCollectionRecordVehInit> loanBeCollectionRecordVehInitList = loanBeCollectionRecordInit.getLoanBeCollectionRecordVehInitList();
List<AppBeCollectionRecordVehInit> appBeCollectionRecordVehInits = new ArrayList<>();
for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInitList) {
@ -461,7 +492,7 @@ public class BeCollectionService {
loanBeCollectionRecordDto.setSaleVehSids(dto.getSaleVehSids());
List<String> files = dto.getFiles();
List<LoanBeCollectionRecordFile> loanBeCollectionRecordFiles = new ArrayList<>();
if (files != null && files.size() > 0){
if (files != null && files.size() > 0) {
for (String file : files) {
LoanBeCollectionRecordFile loanBeCollectionRecordFile = new LoanBeCollectionRecordFile();
loanBeCollectionRecordFile.setUrl(file);

Loading…
Cancel
Save