Browse Source

修改

master
dimengzhe 2 years ago
parent
commit
ab984349e2
  1. 8
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java
  2. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
  3. 26
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java
  4. 2
      doc/databases/risk_center.sql

8
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java

@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank;
/** /**
* @Author dimengzhe * @Author dimengzhe
* @Date 2023/3/22 15:02 * @Date 2023/3/22 15:02
@ -54,22 +56,27 @@ public class SolutionsDto implements Dto {
@ApiModelProperty("首付款比例") @ApiModelProperty("首付款比例")
private String downPayRatio; private String downPayRatio;
@ApiModelProperty("首付金额") @ApiModelProperty("首付金额")
@NotBlank(message = "首付金额不能为空")
private String downPayAmount; private String downPayAmount;
@ApiModelProperty("贷款金额") @ApiModelProperty("贷款金额")
private String loanAmount; private String loanAmount;
@ApiModelProperty("贷款期数") @ApiModelProperty("贷款期数")
@NotBlank(message = "产品期数不能为空")
private String loanPeriod; private String loanPeriod;
@ApiModelProperty("贷款保证金比例") @ApiModelProperty("贷款保证金比例")
private String bondRatio; private String bondRatio;
@ApiModelProperty("贷款保证金金额") @ApiModelProperty("贷款保证金金额")
@NotBlank(message = "贷款保证金不能为空")
private String bondAmount; private String bondAmount;
@ApiModelProperty("厂家贴息") @ApiModelProperty("厂家贴息")
@NotBlank(message = "厂家贴息不能为空")
private String factoryDiscount; private String factoryDiscount;
@ApiModelProperty("厂家贴息用途") @ApiModelProperty("厂家贴息用途")
private String factoryDiscountUse; private String factoryDiscountUse;
@ApiModelProperty("年利率") @ApiModelProperty("年利率")
private String policyYearRatio; private String policyYearRatio;
@ApiModelProperty("月还金额") @ApiModelProperty("月还金额")
@NotBlank(message = "月还金额不能为空")
private String loanPayMoney; private String loanPayMoney;
@ApiModelProperty("利息总额") @ApiModelProperty("利息总额")
private String loanInterest; private String loanInterest;
@ -115,6 +122,7 @@ public class SolutionsDto implements Dto {
@ApiModelProperty("落户保证金") @ApiModelProperty("落户保证金")
private String depositSettle; private String depositSettle;
@ApiModelProperty("服务费") @ApiModelProperty("服务费")
@NotBlank(message = "服务费不能为空")
private String serviceAmount; private String serviceAmount;
@ApiModelProperty("代收意外险") @ApiModelProperty("代收意外险")
private String proxyAccidentPremium; private String proxyAccidentPremium;

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@ -490,7 +490,6 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
} else {//外部金融的只需要录入厂家贴息 } else {//外部金融的只需要录入厂家贴息
//查询金融方案 //查询金融方案
loanSolutions = new LoanSolutions(); loanSolutions = new LoanSolutions();
BeanUtil.copyProperties(dto, loanSolutions);
if (StringUtils.isBlank(dto.getFactoryDiscount())) { if (StringUtils.isBlank(dto.getFactoryDiscount())) {
loanSolutions.setFactoryDiscount(new BigDecimal(BigInteger.ZERO)); loanSolutions.setFactoryDiscount(new BigDecimal(BigInteger.ZERO));
} }

26
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java

@ -1,5 +1,7 @@
package com.yxt.anrui.terminal.api.risk.solutions; package com.yxt.anrui.terminal.api.risk.solutions;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -25,18 +27,25 @@ public class AppSolutionsDetailsVo implements Vo {
@ApiModelProperty("产品政策名称") @ApiModelProperty("产品政策名称")
private String policyName; private String policyName;
@ApiModelProperty("主车发票价") @ApiModelProperty("主车发票价")
@JsonSerialize(using = ToStringSerializer.class)
private String mainVehicleAmount; private String mainVehicleAmount;
@ApiModelProperty("融资票据") @ApiModelProperty("融资票据")
@JsonSerialize(using = ToStringSerializer.class)
private String accessoriesAmount; private String accessoriesAmount;
@ApiModelProperty("挂车金额") @ApiModelProperty("挂车金额")
@JsonSerialize(using = ToStringSerializer.class)
private String trailerAmount; private String trailerAmount;
@ApiModelProperty("购置税") @ApiModelProperty("购置税")
@JsonSerialize(using = ToStringSerializer.class)
private String purchaseTax; private String purchaseTax;
@ApiModelProperty("保险金额") @ApiModelProperty("保险金额")
@JsonSerialize(using = ToStringSerializer.class)
private String premium; private String premium;
@ApiModelProperty("车损上浮") @ApiModelProperty("车损上浮")
@JsonSerialize(using = ToStringSerializer.class)
private String vehDamageFloat; private String vehDamageFloat;
@ApiModelProperty("融资项目总额") @ApiModelProperty("融资项目总额")
@JsonSerialize(using = ToStringSerializer.class)
private String loanTotal; private String loanTotal;
@ApiModelProperty("是否有融资票据") @ApiModelProperty("是否有融资票据")
@ -55,22 +64,28 @@ public class AppSolutionsDetailsVo implements Vo {
@ApiModelProperty("首付款比例") @ApiModelProperty("首付款比例")
private String downPayRatio; private String downPayRatio;
@ApiModelProperty("首付金额") @ApiModelProperty("首付金额")
@JsonSerialize(using = ToStringSerializer.class)
private String downPayAmount; private String downPayAmount;
@ApiModelProperty("贷款金额") @ApiModelProperty("贷款金额")
@JsonSerialize(using = ToStringSerializer.class)
private String loanAmount; private String loanAmount;
@ApiModelProperty("贷款期数") @ApiModelProperty("贷款期数")
private String loanPeriod; private String loanPeriod;
@ApiModelProperty("贷款保证金比例") @ApiModelProperty("贷款保证金比例")
private String bondRatio; private String bondRatio;
@ApiModelProperty("贷款保证金金额") @ApiModelProperty("贷款保证金金额")
@JsonSerialize(using = ToStringSerializer.class)
private String bondAmount; private String bondAmount;
@ApiModelProperty("厂家贴息") @ApiModelProperty("厂家贴息")
@JsonSerialize(using = ToStringSerializer.class)
private String factoryDiscount; private String factoryDiscount;
@ApiModelProperty("年利率") @ApiModelProperty("年利率")
private String policyYearRatio; private String policyYearRatio;
@ApiModelProperty("月还金额") @ApiModelProperty("月还金额")
@JsonSerialize(using = ToStringSerializer.class)
private String loanPayMoney; private String loanPayMoney;
@ApiModelProperty("利息总额") @ApiModelProperty("利息总额")
@JsonSerialize(using = ToStringSerializer.class)
private String loanInterest; private String loanInterest;
//其他融 //其他融
@ -78,23 +93,29 @@ public class AppSolutionsDetailsVo implements Vo {
@ApiModelProperty("其它融名称") @ApiModelProperty("其它融名称")
private String otherPolicyName; private String otherPolicyName;
@ApiModelProperty("其它融贷款金额") @ApiModelProperty("其它融贷款金额")
@JsonSerialize(using = ToStringSerializer.class)
private String otherPolicyAmount; private String otherPolicyAmount;
@ApiModelProperty("其它融期数") @ApiModelProperty("其它融期数")
private String otherPolicyPeriod; private String otherPolicyPeriod;
@ApiModelProperty("其它融月还") @ApiModelProperty("其它融月还")
@JsonSerialize(using = ToStringSerializer.class)
private String otherPolicyMonthlyRepay; private String otherPolicyMonthlyRepay;
@ApiModelProperty("其它融利息总额") @ApiModelProperty("其它融利息总额")
@JsonSerialize(using = ToStringSerializer.class)
private String otherPolicyInterest; private String otherPolicyInterest;
@ApiModelProperty("'融资首付") @ApiModelProperty("'融资首付")
@JsonSerialize(using = ToStringSerializer.class)
private String loanDownPay; private String loanDownPay;
@ApiModelProperty("总贷款金额") @ApiModelProperty("总贷款金额")
@JsonSerialize(using = ToStringSerializer.class)
private String loanAmountTotal; private String loanAmountTotal;
@ApiModelProperty("期数") @ApiModelProperty("期数")
private String period; private String period;
@ApiModelProperty("月还金额") @ApiModelProperty("月还金额")
private String monthlyRepay; private String monthlyRepay;
@ApiModelProperty("利息总额") @ApiModelProperty("利息总额")
@JsonSerialize(using = ToStringSerializer.class)
private String interest; private String interest;
@ApiModelProperty("预计首期还款日") @ApiModelProperty("预计首期还款日")
private String returnTime; private String returnTime;
@ -134,13 +155,18 @@ public class AppSolutionsDetailsVo implements Vo {
@ApiModelProperty("抵顶购置税") @ApiModelProperty("抵顶购置税")
private String offsetPurchasetax; private String offsetPurchasetax;
@ApiModelProperty("抵顶费用合计") @ApiModelProperty("抵顶费用合计")
@JsonSerialize(using = ToStringSerializer.class)
private String offsetTotal; private String offsetTotal;
@ApiModelProperty("应收合计") @ApiModelProperty("应收合计")
@JsonSerialize(using = ToStringSerializer.class)
private String receivableTotal; private String receivableTotal;
@ApiModelProperty("实收合计") @ApiModelProperty("实收合计")
@JsonSerialize(using = ToStringSerializer.class)
private String realTotal; private String realTotal;
@ApiModelProperty("车辆总价") @ApiModelProperty("车辆总价")
@JsonSerialize(using = ToStringSerializer.class)
private String vehTotalPrice; private String vehTotalPrice;
@ApiModelProperty("名义留购价") @ApiModelProperty("名义留购价")
@JsonSerialize(using = ToStringSerializer.class)
private String nominalPrice; private String nominalPrice;
} }

2
doc/databases/risk_center.sql

@ -970,7 +970,7 @@ CREATE TABLE `loan_solutions_otherPolicy`
`loanDownPay` decimal(10, 2) DEFAULT NULL COMMENT '融资首付', `loanDownPay` decimal(10, 2) DEFAULT NULL COMMENT '融资首付',
`loanAmountTotal` decimal(10, 2) DEFAULT NULL COMMENT '总贷款金额', `loanAmountTotal` decimal(10, 2) DEFAULT NULL COMMENT '总贷款金额',
`period` varchar(64) DEFAULT NULL COMMENT '期数', `period` varchar(64) DEFAULT NULL COMMENT '期数',
`monthlyRepay` decimal(10, 2) DEFAULT NULL COMMENT '月还金额', `monthlyRepay` varchar(200) DEFAULT NULL COMMENT '月还金额',
`interest` decimal(10, 2) DEFAULT NULL COMMENT '利息总额', `interest` decimal(10, 2) DEFAULT NULL COMMENT '利息总额',
`returnTime` varchar(64) DEFAULT NULL COMMENT '预计首期还款日', `returnTime` varchar(64) DEFAULT NULL COMMENT '预计首期还款日',
`otherPolicyYearRatio` varchar(64) DEFAULT NULL COMMENT '年利率', `otherPolicyYearRatio` varchar(64) DEFAULT NULL COMMENT '年利率',

Loading…
Cancel
Save