diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java index bbcec9dcaa..215a84bf52 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java @@ -175,4 +175,7 @@ public class SolutionsDetailsssVo { private String bondTypeKey; + @ApiModelProperty("抵顶配件项") + private String offsetAccessories; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 3f772a3882..b5c3c9b2c3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -1876,7 +1876,7 @@ public class BusSalesOrderService extends MybatisBaseService0){ + calculateVo.setOffsetAccessories(offsetAccessoriesBig.toString()); + }else{ + offsetAccessoriesBig = BigDecimal.ZERO; + calculateVo.setOffsetAccessories(offsetAccessoriesBig.toString()); + } + /************************计算融资首付********************************/ calculateVo.setLoanDownPay(loanDownPay.setScale(0, BigDecimal.ROUND_HALF_UP).toString()); //实际首付比例 = (融资首付/融资项目总额)x100 - downPayAmountsRatio = loanDownPay.divide(loanTotal, 4, BigDecimal.ROUND_CEILING).multiply(new BigDecimal("100")); +// downPayAmountsRatio = loanDownPay.divide(loanTotal, 4, BigDecimal.ROUND_CEILING).multiply(new BigDecimal("100")); + downPayAmountsRatio = loanDownPay.divide(bilAll, 4, BigDecimal.ROUND_CEILING).multiply(new BigDecimal("100")); downPayAmountsRatio = downPayAmountsRatio.setScale(2, BigDecimal.ROUND_HALF_UP); calculateVo.setDownPayAmountsRatio(downPayAmountsRatio.toString()); if (otherPolicyState) {//包含 @@ -1658,6 +1677,7 @@ public class LoanSolutionsService extends MybatisBaseService0){ + offsetAccessoriesValue = offsetAccessoriesValue.append("配件抵顶:").append(solutionssVo.getOffsetAccessories()); + list.add(getValueSpanSize(offsetAccessoriesValue.toString(), 1, 0, false)); + } + } //实收合计 StringBuilder realTotalValue = new StringBuilder(); if (StringUtils.isNotBlank(solutionssVo.getRealTotal())) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java index b77a19b41a..2f6e292902 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java @@ -217,5 +217,8 @@ public class AppSolutionVo { @ApiModelProperty("保证金类型01固定,02敞口") private String bondTypeKey; + @ApiModelProperty("抵顶配件项") + private String offsetAccessories; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java index 5cd9f1dc96..9eff4d5b08 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java @@ -190,4 +190,7 @@ public class AppSolutionsDetailsVo implements Vo { @ApiModelProperty("保证金类型01固定,02敞口") private String bondTypeKey; + + @ApiModelProperty("抵顶配件项") + private String offsetAccessories; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java index 68904f6c4d..f0b3e9139a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java @@ -172,4 +172,7 @@ public class AppSolutionssDto implements Dto { private String actualDiscount; @ApiModelProperty("其他融实际贴息") private String otherActualDiscount; + + @ApiModelProperty("抵顶配件项") + private String offsetAccessories; }