结清申请优化

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,33 +811,40 @@ 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();
                         }
-                        //生成结清应收
-                        pushNewUnLists(loanSettleApply);
-                        if (amountTo.compareTo(BigDecimal.ZERO) <= 0) {
-                            //减免后结清合计 <= 0
-                            //结转剩余保证金
-                            carryForward(loanSettleApply);
-                            //减免剩余应收
-                            reliefMoney(loanSettleApply);
-                            //设置结清申请的“客户结清确认”状态为是
-                            loanSettleApply.setState(1);
-                            //更新车辆表结清状态
-                            baseMapper.updateBus(loanSettleApply.getBusVinSid(), "1");
-                            //推送资方结清款到出纳代付款列表
-                            pushBankSettlePrice(loanSettleApply);
-                            //设置认款月还为已转付
-                            updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
+                    }
+                } else {
+                    LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(businessSid);
+                    if (null != loanSettleCompanyCost) {
+                        if (null != loanSettleCompanyCost.getSettleAll()) {
+                            amountTo = loanSettleCompanyCost.getSettleAll();
                         }
                     }
                 }
+                //生成结清应收
+                pushNewUnLists(loanSettleApply);
+                if (amountTo.compareTo(BigDecimal.ZERO) <= 0) {
+                    //减免后结清合计 <= 0
+                    //结转剩余保证金
+                    carryForward(loanSettleApply);
+                    //减免剩余应收
+                    reliefMoney(loanSettleApply);
+                    //设置结清申请的“客户结清确认”状态为是
+                    loanSettleApply.setState(1);
+                    //更新车辆表结清状态
+                    baseMapper.updateBus(loanSettleApply.getBusVinSid(), "1");
+                    //推送资方结清款到出纳代付款列表
+                    pushBankSettlePrice(loanSettleApply);
+                    //设置认款月还为已转付
+                    updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
+                }
                 baseMapper.updateById(loanSettleApply);
             } else {
                 //极光推送