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 7d95ece6dc..caf42d4235 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 @@ -879,11 +879,15 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { + //结转剩余保证金 + carryForward(loanSettleApply); + check = 1; + } //设置结清申请的“客户结清确认”状态为是 loanSettleApply.setState(1); //更新车辆表结清状态 @@ -960,7 +970,7 @@ public class LoanSettleApplyService extends MybatisBaseService histories = new ArrayList<>();//还款记录 List updatePsList = new ArrayList<>();//还款计划明细集合 @@ -1172,24 +1179,7 @@ public class LoanSettleApplyService extends MybatisBaseService 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) { @@ -1639,7 +1629,7 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { - GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); - voucherDetail.setSceneCode("剩余贷款保证金结转"); - voucherDetail.setBankName(planDetails.getBankName()); - voucherDetail.setDeptCode(deptCode); - voucherDetail.setCustomerCode(customerNumber); - voucherDetail.setAmount(sybzj); - voucherDetails.add(voucherDetail); + if (check == 1) { + if (sybzj.compareTo(BigDecimal.ZERO) > 0) { + GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); + voucherDetail.setSceneCode("剩余贷款保证金结转"); + voucherDetail.setBankName(planDetails.getBankName()); + voucherDetail.setDeptCode(deptCode); + voucherDetail.setCustomerCode(customerNumber); + voucherDetail.setAmount(sybzj); + voucherDetails.add(voucherDetail); + } } //贷款保证金扣罚 if (bzjKFCw.compareTo(BigDecimal.ZERO) > 0) { @@ -2882,6 +2874,7 @@ public class LoanSettleApplyService extends MybatisBaseService