Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCost.java

@@ -44,6 +44,8 @@ public class LoanSettleCompanyCost extends BaseEntity {
     private BigDecimal settleAll;
     @ApiModelProperty("截止当前资金占用费")
     private BigDecimal fundAll;
+    @ApiModelProperty("当前公司结清合计")
+    private BigDecimal settleAll2;
 
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java

@@ -42,4 +42,6 @@ public class LoanSettleCompanyCostVo {
 
     @ApiModelProperty("截止当前资金占用费")
     private String fundAll;
+    @ApiModelProperty("当前公司结清合计")
+    private String settleAll2;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java

@@ -1436,9 +1436,25 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                 amount = overDueMonthPrice.add(currentNotDuePrice).add(notDuePrice);
             }
             loanSettleApplyDetailsVo.setBuyBackMoney((amountBack.subtract(amount)).toString());
-            loanSettleApplyDetailsVo.setLoanSettleCompanyCostVo(loanSettleCompanyCostVo);
+
             loanSettleApplyDetailsVo.setShowHg(true);
             loanSettleApplyDetailsVo.setBusSid(sid);
+            //当前公司结清合计：回购申请的公司正常结清合计-回购后的月还款金额+（截止当前资金占用费-原回购申请的资金占用费）
+            BigDecimal settlyAll2 = BigDecimal.ZERO;
+            if(StringUtils.isNotBlank(companyCostVo.getSettleAll())){
+                settlyAll2 = settlyAll2.add(new BigDecimal(companyCostVo.getSettleAll()));
+            }
+            if(StringUtils.isNotBlank(loanSettleApplyDetailsVo.getBuyBackMoney())){
+                settlyAll2 = settlyAll2.subtract(new BigDecimal(loanSettleApplyDetailsVo.getBuyBackMoney()));
+            }
+            if(StringUtils.isNotBlank(fundAll)){
+                settlyAll2 = settlyAll2.add(new BigDecimal(fundAll));
+            }
+            if(StringUtils.isNotBlank(companyCostVo.getFunfCost())){
+                settlyAll2 = settlyAll2.subtract(new BigDecimal(companyCostVo.getFunfCost()));
+            }
+            loanSettleCompanyCostVo.setSettleAll2(settlyAll2.toString());
+            loanSettleApplyDetailsVo.setLoanSettleCompanyCostVo(loanSettleCompanyCostVo);
         }
         return rb.success().setData(loanSettleApplyDetailsVo);
     }