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 caf42d4235..54953a809b 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 @@ -956,9 +956,13 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { //结转剩余保证金 - carryForward(loanSettleApply); + BigDecimal decimal = carryForward(loanSettleApply); + if (null != decimal) { + actualDeposit = decimal; + } check = 1; } //设置结清申请的“客户结清确认”状态为是 @@ -970,7 +974,7 @@ public class LoanSettleApplyService extends MybatisBaseService histories = new ArrayList<>();//还款记录 @@ -1178,6 +1184,7 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { loanRepaymentPlanDetailsService.updateList(updatePsList); } + returnDecimal = finalDeposit.subtract(deposit); + return returnDecimal; } //--------------------------------- 减免 ---------------------------- @@ -1629,7 +1638,7 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { + if (actualDeposit.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); + voucherDetail.setAmount(actualDeposit); voucherDetails.add(voucherDetail); } } @@ -2874,8 +2883,12 @@ public class LoanSettleApplyService extends MybatisBaseService