diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyCommonVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyCommonVo.java index 5ccf9b17b7..7c7eb069c8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyCommonVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyCommonVo.java @@ -3,6 +3,8 @@ package com.yxt.anrui.riskcenter.api.loansettleapply; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @description: * @author: dimengzhe @@ -47,7 +49,8 @@ public class SettleApplyCommonVo { private String companyCurrentNotPrice; @ApiModelProperty("贷款保证金扣罚金额") private String deductionAmount; - + @ApiModelProperty("公司未到期金额") + private String bankNotPrice; @ApiModelProperty("销售订单sid") private String saleOrderSid; private String bankSid; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCost.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCost.java index 877a3c705c..da280abeeb 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCost.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCost.java @@ -28,7 +28,7 @@ public class LoanSettleCompanyCost extends BaseEntity { private BigDecimal bankOverInterest; @ApiModelProperty("公司当期未到期月还") private BigDecimal companyCurrentNotPrice; - @ApiModelProperty("资方未到期金额") + @ApiModelProperty("公司未到期金额") private BigDecimal bankNotPrice; @ApiModelProperty("贷款保证金扣罚金额") private BigDecimal deductionAmount; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java index f7df5231be..b8b995a0a5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java @@ -25,7 +25,7 @@ public class LoanSettleCompanyCostVo { private String bankOverInterest; @ApiModelProperty("公司当期未到期月还") private String companyCurrentNotPrice; - @ApiModelProperty("资方未到期金额") + @ApiModelProperty("公司未到期金额") private String bankNotPrice; @ApiModelProperty("贷款保证金扣罚金额") private String deductionAmount; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReduction.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReduction.java index 79460b18d4..f6e655d26d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReduction.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReduction.java @@ -26,5 +26,9 @@ public class LoanSettleCompanyReduction extends BaseEntity { private BigDecimal amountTo; @ApiModelProperty("结清利润") private BigDecimal profit; + @ApiModelProperty("公司未到期利息减免") + private BigDecimal notDuePriceRelief; + @ApiModelProperty("减免依据") + private BigDecimal reliefBasis; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReductionVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReductionVo.java index 73a3e07e49..ecf0f02007 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReductionVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReductionVo.java @@ -23,4 +23,8 @@ public class LoanSettleCompanyReductionVo { private String amountTo; @ApiModelProperty("结清利润") private String profit; + @ApiModelProperty("公司未到期利息减免") + private String notDuePriceRelief; + @ApiModelProperty("减免依据") + private String reliefBasis; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java index 3bed6c5525..fbf5e8c50f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java @@ -617,6 +617,7 @@ public class LoanSettleApplyService extends MybatisBaseService