修改认款推送凭证

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -4418,13 +4418,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 //更新审核时间
                 finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
                 finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
-                //认资方退还垫款或者结清时资方逾期利息
-                if (v.getReceivablesName().equals("资方退还垫款") || v.getReceivablesName().equals("贷款保证金扣罚")) {
-                    CollectionVoucher.CollectionVoucherDetail d = getReturnBackMoneyVoucher(v, collectionDate);
-                    voucherDetails.add(d);
-                }
-                //推送间还待转付列表
-                if (v.getReceivablesName().equals("月还") || v.getReceivablesName().equals("资方逾期利息")) {
                 String planSid = "";
                 if (v.getReceivablesName().equals("月还")) {
                     planSid = v.getReceivablesSid();
@@ -4435,6 +4428,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     }
                 }
                 LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(planSid).getData();
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
+               if("0".equals(busSalesOrderVehicle.getRiskState().toString())){
+                   //认资方退还垫款或者结清时资方逾期利息
+                   if (v.getReceivablesName().equals("资方退还垫款") || v.getReceivablesName().equals("贷款保证金扣罚")) {
+                       CollectionVoucher.CollectionVoucherDetail d = getReturnBackMoneyVoucher(v, collectionDate);
+                       voucherDetails.add(d);
+                   }
+                   //推送间还待转付列表
+                   if (v.getReceivablesName().equals("月还") || v.getReceivablesName().equals("资方逾期利息")) {
                        if (null != planDetails) {
                            if (v.getReceivablesName().equals("月还")) {
                                //推送间还认款记录
@@ -4616,12 +4618,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                    }
                    //认资金占用费消减平台资金占用费
                    if (v.getReceivablesName().equals("资金占用费")) {
-                    String planSid = "";
-                    FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(v.getReceivablesSid());
-                    if (jr != null) {
-                        planSid = jr.getBusSid();
-                    }
-                    LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(planSid).getData();
                        if (null != planDetails) {
                            LoanPlanDetailsVoForFundVoucher f = loanRepaymentPlanDetailsFeign.getLoanPlanDetailsVoForFundVoucher(planDetails.getBusVinSid());
                            if (null != f) {
@@ -4672,6 +4668,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                        CollectionVoucher.CollectionVoucherDetail d = getBalanceMoneyVoucher(v, collectionDate);
                        voucherDetails.add(d);
                    }
+               }
+
             });
             //查询该申请已认款金额总数
             subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);