结清申请优化

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

@@ -473,7 +473,24 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 if (StringUtils.isNotBlank(loanSettleApply.getNodeState())) {
                     if (loanSettleApply.getNodeState().equals("已办结")) {
                         if (loanSettleApply.getState().intValue() == 0) {
-                            if (loanSettleCompanyReduction.getAmountTo().compareTo(BigDecimal.ZERO) > 0) {
+                            //获取公司减免情况
+                            BigDecimal amountTo = BigDecimal.ZERO;
+                            if (loanSettleApply.getTrueReduction() == 1) {
+                                LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(sid);
+                                if (null != reduction) {
+                                    if (null != reduction.getAmountTo()) {
+                                        amountTo = reduction.getAmountTo();
+                                    }
+                                }
+                            } else {
+                                 loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(sid);
+                                if (null != loanSettleCompanyCost) {
+                                    if (null != loanSettleCompanyCost.getSettleAll()) {
+                                        amountTo = loanSettleCompanyCost.getSettleAll();
+                                    }
+                                }
+                            }
+                            if (amountTo.compareTo(BigDecimal.ZERO) > 0) {
                                 loanSettleApplyDetailsVo.setConfirmAtn(true);
                             }
                         }
@@ -794,14 +811,23 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 loanSettleApply.setCloseDate(new Date());
                 loanSettleApply.setSettingDate(DateUtil.today());
                 baseMapper.updateBus(loanSettleApply.getBusVinSid(), "3");
+                //获取公司减免情况
+                BigDecimal amountTo = BigDecimal.ZERO;
                 if (loanSettleApply.getTrueReduction() == 1) {
                     LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(businessSid);
                     if (null != reduction) {
-                        //获取公司减免情况
-                        BigDecimal amountTo = BigDecimal.ZERO;
                         if (null != reduction.getAmountTo()) {
                             amountTo = reduction.getAmountTo();
                         }
+                    }
+                } else {
+                    LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(businessSid);
+                    if (null != loanSettleCompanyCost) {
+                        if (null != loanSettleCompanyCost.getSettleAll()) {
+                            amountTo = loanSettleCompanyCost.getSettleAll();
+                        }
+                    }
+                }
                 //生成结清应收
                 pushNewUnLists(loanSettleApply);
                 if (amountTo.compareTo(BigDecimal.ZERO) <= 0) {
@@ -819,8 +845,6 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     //设置认款月还为已转付
                     updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
                 }
-                    }
-                }
                 baseMapper.updateById(loanSettleApply);
             } else {
                 //极光推送