金融方案优化

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

@@ -1355,6 +1355,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             BigDecimal loanInterestNew = loanInterest.subtract(new BigDecimal(factoryDiscount));
             if(loanInterestNew.compareTo(BigDecimal.ZERO)<0){
                 actualDiscount = actualDiscount.subtract(BigDecimal.ZERO);
+            }else{
+                actualDiscount = actualDiscount.subtract(loanInterestNew);
             }
             //再根据厂家贴息、旧月还计算新月还金额 = 旧月还金额 减去 厂家贴息 除以 期数
             BigDecimal loanPayMoneyNew = loanPayMoney.subtract(new BigDecimal(factoryDiscount).divide(new BigDecimal(loanPeriod), 4, BigDecimal.ROUND_HALF_UP));
@@ -1448,6 +1450,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 BigDecimal otherPolicyInterestNew = otherPolicyInterest.subtract(new BigDecimal(otherDiscount));
                 if(otherPolicyInterestNew.compareTo(BigDecimal.ZERO)<0){
                     otherActualDiscount = otherActualDiscount.subtract(BigDecimal.ZERO);
+                }else{
+                    otherActualDiscount = otherActualDiscount.subtract(otherPolicyInterestNew);
                 }
                 //再根据厂家贴息、旧月还计算新月还金额 = 旧月还金额 减去 厂家贴息 除以 期数
                 BigDecimal otherPolicyMonthlyRepayNew = otherPolicyMonthlyRepay.subtract(new BigDecimal(otherDiscount).divide(new BigDecimal(otherPolicyPeriod), 4, BigDecimal.ROUND_HALF_UP));