Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -1128,9 +1128,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
     private void carryForward(LoanSettleApply loanSettleApply) {
         String userSid = loanSettleApply.getCreateBySid();
         BigDecimal deposit = BigDecimal.ZERO; // 贷款保证金 - （扣罚金额-贷款保证金减免）
-        BigDecimal depositKF = BigDecimal.ZERO; // 贷款保证金 - （扣罚金额-贷款保证金减免）
-        BigDecimal depositJM = BigDecimal.ZERO; // 贷款保证金 - （扣罚金额-贷款保证金减免）
-        BigDecimal amountTo = BigDecimal.ZERO; // 资方结清合计
+//        BigDecimal depositKF = BigDecimal.ZERO; // 贷款保证金 - （扣罚金额-贷款保证金减免）
+//        BigDecimal depositJM = BigDecimal.ZERO; // 贷款保证金 - （扣罚金额-贷款保证金减免）
+//        BigDecimal amountTo = BigDecimal.ZERO; // 资方结清合计
         String busVinSid = loanSettleApply.getBusVinSid();
         List<LoanRepaymentHistory> histories = new ArrayList<>();//还款记录
         List<LoanRepaymentPlanDetails> updatePsList = new ArrayList<>();//还款计划明细集合
@@ -1147,24 +1147,24 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             if (null != companyCost.getLoanDeposit()) {
                 deposit = companyCost.getLoanDeposit();
             }
-            if (null != companyCost.getDeductionAmount()) {
-                depositKF = companyCost.getDeductionAmount();
-            }
-        }
-        LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(loanSettleApply.getSid());
-        if (null != reduction) {
-            if (null != reduction.getDepositPenalty()) {
-                depositJM = reduction.getDepositPenalty();
-            }
-            if (null != reduction.getAmountTo()) {
-                amountTo = reduction.getAmountTo();
-            }
-        }
-        if (amountTo.compareTo(BigDecimal.ZERO) > 0) {
-            deposit = deposit.subtract(depositKF).add(depositJM);
-        } else if (amountTo.compareTo(BigDecimal.ZERO) <= 0) {
-            deposit = deposit.subtract(depositKF).add(depositJM).add(amountTo);
+//            if (null != companyCost.getDeductionAmount()) {
+//                depositKF = companyCost.getDeductionAmount();
+//            }
         }
+//        LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(loanSettleApply.getSid());
+//        if (null != reduction) {
+//            if (null != reduction.getDepositPenalty()) {
+//                depositJM = reduction.getDepositPenalty();
+//            }
+//            if (null != reduction.getAmountTo()) {
+//                amountTo = reduction.getAmountTo();
+//            }
+//        }
+//        if (amountTo.compareTo(BigDecimal.ZERO) > 0) {
+//            deposit = deposit.subtract(depositKF).add(depositJM);
+//        } else if (amountTo.compareTo(BigDecimal.ZERO) <= 0) {
+//            deposit = deposit.subtract(depositKF).add(depositJM).add(amountTo);
+//        }
         //按照顺序结转
         //月还
         if (deposit.compareTo(BigDecimal.ZERO) > 0) {