diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 70f498add1..33862e4c62 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -4441,6 +4441,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                        if (null != planDetails) {
                            if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
                                if (v.getReceivablesName().equals("月还")) {
+                                   //推送间还认款记录
+                                   LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
+                                   historyEntity.setPlanDetailSid(planSid);
+                                   historyEntity.setScheduleSid(planDetails.getScheduleSid());
+                                   historyEntity.setSkdBillNo(finalConfirmation.getBillNo());
+                                   historyEntity.setUpdateTime(new DateTime());
+                                   historyEntity.setUpdateState("1");
+                                   historyEntity.setDataTime(new DateTime());
+                                   historyEntity.setBuckle("审核通过");
+                                   historyEntity.setBuckleKey("003");
+                                   historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                   historyEntity.setReturnWay("间还");
+                                   historyEntity.setReturnWayKey("02");
                                    if (null != planDetails.getPaymentMoney()) {
                                        if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
                                            BigDecimal paymentMoney = planDetails.getPaymentMoney();
@@ -4448,8 +4461,104 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                            BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
                                            planDetails.setPaymentMoney(subtract);
                                            loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
+                                           String orderSid = planDetails.getSalesOrderSid();
+                                           String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData();
+                                           String bankSid = "";
+                                           String scheduleSid = planDetails.getScheduleSid();
+                                           LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData();
+                                           if (isOther.equals("0")) {
+                                               if (StringUtils.isNotBlank(schedule.getBankSid())) {
+                                                   bankSid = schedule.getBankSid();
+                                               }
+                                           } else if (isOther.equals("1")) {
+                                               if (StringUtils.isNotBlank(schedule.getOtherBankSid())) {
+                                                   bankSid = schedule.getOtherBankSid();
+                                               }
+                                           }
+                                           ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid);
+                                           if (bankResultBean.getData() != null) {
+                                               LoanFinBank loanFinBank = bankResultBean.getData();
+                                               if (null != loanFinBank.getReAdvances()) {
+                                                   if (loanFinBank.getReAdvances() == 1) {
+                                                       try {
+                                                           Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                                           historyEntity.setActualDate(collDate);
+                                                           if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                                               //未逾期
+                                                               Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                                               cal_1.setTime(planDetails.getDueDate());
+                                                               cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                                               historyEntity.setPrepareDate(cal_1.getTime());
+                                                           } else {
+                                                               //已逾期
+                                                               historyEntity.setPrepareDate(new DateTime());
+                                                           }
+                                                       } catch (ParseException e) {
+                                                           e.printStackTrace();
+                                                       }
+                                                       historyEntity.setPaymentState("待转付");
+                                                       historyEntity.setPaymentStateKey("001");
+                                                       FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                                                       jr.setCreateBySid(userSid);
+                                                       SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData();
+                                                       jr.setCreateByName(userVo.getName());
+                                                       jr.setBusSid(planSid);
+                                                       jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                                       jr.setReveivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                                       jr.setPayCostTitleKey("007");
+                                                       jr.setPayCostTitleValue("资方退还垫款");
+                                                       jr.setOrgSidPath(planDetails.getOrgSidPath());
+                                                       jr.setUseOrgName(planDetails.getUseOrgName());
+                                                       jr.setUseOrgSid(planDetails.getUseOrgSid());
+                                                       jr.setStaffDeptName(planDetails.getDept());
+                                                       jr.setStaffName(planDetails.getStaffName());
+                                                       jr.setStaffDeptSid(planDetails.getDeptSid());
+                                                       jr.setStaffUserSid(planDetails.getSalesUserSid());
+                                                       finUncollectedReceivablesDetailedJRService.insert(jr);
+                                                   }
+                                               }
+                                           }
+                                       } else if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) {
+                                           try {
+                                               Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                               historyEntity.setActualDate(collDate);
+                                               if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                                   //未逾期
+                                                   Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                                   cal_1.setTime(planDetails.getDueDate());
+                                                   cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                                   historyEntity.setPrepareDate(cal_1.getTime());
+                                               } else {
+                                                   //已逾期
+                                                   historyEntity.setPrepareDate(new DateTime());
+                                               }
+                                           } catch (ParseException e) {
+                                               e.printStackTrace();
+                                           }
+                                           historyEntity.setPaymentState("待转付");
+                                           historyEntity.setPaymentStateKey("001");
+                                       }
+                                   } else {
+                                       try {
+                                           Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                           historyEntity.setActualDate(collDate);
+                                           if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                               //未逾期
+                                               Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                               cal_1.setTime(planDetails.getDueDate());
+                                               cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                               historyEntity.setPrepareDate(cal_1.getTime());
+                                           } else {
+                                               //已逾期
+                                               historyEntity.setPrepareDate(new DateTime());
+                                           }
+                                       } catch (ParseException e) {
+                                           e.printStackTrace();
                                        }
+                                       historyEntity.setPaymentState("已转付");
+                                       historyEntity.setPaymentStateKey("003");
                                    }
+                                   loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity);
 
                                }
                                if (v.getReceivablesName().equals("资方逾期利息")){
@@ -4891,6 +5000,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         list.add(voucherResultDetailDtoDf);
                         if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
                             if("月还".equals(v.getReceivablesName())){
+                                //推送间还认款记录
+                                LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
+                                historyEntity.setPlanDetailSid(planSid);
+                                historyEntity.setScheduleSid(planDetails.getScheduleSid());
+                                historyEntity.setSkdBillNo(finalConfirmation.getBillNo());
+                                historyEntity.setUpdateTime(new DateTime());
+                                historyEntity.setUpdateState("1");
+                                historyEntity.setDataTime(new DateTime());
+                                historyEntity.setBuckle("审核通过");
+                                historyEntity.setBuckleKey("003");
+                                historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                historyEntity.setReturnWay("间还");
+                                historyEntity.setReturnWayKey("02");
                                 if (null != planDetails.getPaymentMoney()) {
                                     if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
                                         BigDecimal paymentMoney = planDetails.getPaymentMoney();
@@ -4898,8 +5020,104 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
                                         planDetails.setPaymentMoney(subtract);
                                         loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
+                                        String orderSid = planDetails.getSalesOrderSid();
+                                        String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData();
+                                        String bankSid = "";
+                                        String scheduleSid = planDetails.getScheduleSid();
+                                        LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData();
+                                        if (isOther.equals("0")) {
+                                            if (StringUtils.isNotBlank(schedule.getBankSid())) {
+                                                bankSid = schedule.getBankSid();
+                                            }
+                                        } else if (isOther.equals("1")) {
+                                            if (StringUtils.isNotBlank(schedule.getOtherBankSid())) {
+                                                bankSid = schedule.getOtherBankSid();
+                                            }
+                                        }
+                                        ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid);
+                                        if (bankResultBean.getData() != null) {
+                                            LoanFinBank loanFinBank = bankResultBean.getData();
+                                            if (null != loanFinBank.getReAdvances()) {
+                                                if (loanFinBank.getReAdvances() == 1) {
+                                                    try {
+                                                        Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                                        historyEntity.setActualDate(collDate);
+                                                        if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                                            //未逾期
+                                                            Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                                            cal_1.setTime(planDetails.getDueDate());
+                                                            cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                                            historyEntity.setPrepareDate(cal_1.getTime());
+                                                        } else {
+                                                            //已逾期
+                                                            historyEntity.setPrepareDate(new DateTime());
+                                                        }
+                                                    } catch (ParseException e) {
+                                                        e.printStackTrace();
+                                                    }
+                                                    historyEntity.setPaymentState("待转付");
+                                                    historyEntity.setPaymentStateKey("001");
+                                                    FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                                                    jr.setCreateBySid(userSid);
+                                                    SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData();
+                                                    jr.setCreateByName(userVo.getName());
+                                                    jr.setBusSid(planSid);
+                                                    jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                                    jr.setReveivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                                    jr.setPayCostTitleKey("007");
+                                                    jr.setPayCostTitleValue("资方退还垫款");
+                                                    jr.setOrgSidPath(planDetails.getOrgSidPath());
+                                                    jr.setUseOrgName(planDetails.getUseOrgName());
+                                                    jr.setUseOrgSid(planDetails.getUseOrgSid());
+                                                    jr.setStaffDeptName(planDetails.getDept());
+                                                    jr.setStaffName(planDetails.getStaffName());
+                                                    jr.setStaffDeptSid(planDetails.getDeptSid());
+                                                    jr.setStaffUserSid(planDetails.getSalesUserSid());
+                                                    finUncollectedReceivablesDetailedJRService.insert(jr);
+                                                }
+                                            }
+                                        }
+                                    } else if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) {
+                                        try {
+                                            Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                            historyEntity.setActualDate(collDate);
+                                            if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                                //未逾期
+                                                Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                                cal_1.setTime(planDetails.getDueDate());
+                                                cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                                historyEntity.setPrepareDate(cal_1.getTime());
+                                            } else {
+                                                //已逾期
+                                                historyEntity.setPrepareDate(new DateTime());
+                                            }
+                                        } catch (ParseException e) {
+                                            e.printStackTrace();
+                                        }
+                                        historyEntity.setPaymentState("待转付");
+                                        historyEntity.setPaymentStateKey("001");
+                                    }
+                                } else {
+                                    try {
+                                        Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                        historyEntity.setActualDate(collDate);
+                                        if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                            //未逾期
+                                            Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                            cal_1.setTime(planDetails.getDueDate());
+                                            cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                            historyEntity.setPrepareDate(cal_1.getTime());
+                                        } else {
+                                            //已逾期
+                                            historyEntity.setPrepareDate(new DateTime());
+                                        }
+                                    } catch (ParseException e) {
+                                        e.printStackTrace();
                                     }
+                                    historyEntity.setPaymentState("已转付");
+                                    historyEntity.setPaymentStateKey("003");
                                 }
+                                loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity);
                             }
                             if("资方逾期利息".equals(v.getReceivablesName())){
                                 if (null != planDetails.getPaymentInterest()) {
@@ -5124,33 +5342,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
                         list2.add(voucherResultDetailDtoDf);
                         if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
-                            if("月还".equals(v.getReceivablesName())){
-                                if (null != planDetails.getPaymentMoney()) {
-                                    if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
-                                        BigDecimal paymentMoney = planDetails.getPaymentMoney();
-                                        String subscriptionMoney = v.getSubscriptionMoney();
-                                        BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
-                                        planDetails.setPaymentMoney(subtract);
-                                        loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
-                                    }
-                                }
-                            }
-                            if("资方逾期利息".equals(v.getReceivablesName())){
-                                if (null != planDetails.getPaymentInterest()) {
-                                    if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) {
-                                        BigDecimal paymentInterest = planDetails.getPaymentInterest();
-                                        String subscriptionMoney = v.getSubscriptionMoney();
-                                        BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
-                                        planDetails.setPaymentInterest(subtract);
-                                        BigDecimal paymentMoney = planDetails.getPaymentMoney();
-                                        BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
-                                        planDetails.setPaymentMoney(subtract2);
-                                        loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
-                                    }
-                                }
-                            }
-
-                        }else{
                             if("月还".equals(v.getReceivablesName())){
                                 //推送间还认款记录
                                 LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
@@ -5266,11 +5457,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     } catch (ParseException e) {
                                         e.printStackTrace();
                                     }
-                                    historyEntity.setPaymentState("待转付");
-                                    historyEntity.setPaymentStateKey("001");
+                                    historyEntity.setPaymentState("已转付");
+                                    historyEntity.setPaymentStateKey("003");
                                 }
                                 loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity);
-                            }else{
+                            }
+                            if("资方逾期利息".equals(v.getReceivablesName())){
                                 if (null != planDetails.getPaymentInterest()) {
                                     if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) {
                                         BigDecimal paymentInterest = planDetails.getPaymentInterest();
@@ -5281,16 +5473,151 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
                                         planDetails.setPaymentMoney(subtract2);
                                         loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
-                                        String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData();
-                                        String bankSid = "";
-                                        String scheduleSid = planDetails.getScheduleSid();
-                                        LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData();
-                                        if (isOther.equals("0")) {
-                                            if (StringUtils.isNotBlank(schedule.getBankSid())) {
-                                                bankSid = schedule.getBankSid();
-                                            }
-                                        } else if (isOther.equals("1")) {
-                                            if (StringUtils.isNotBlank(schedule.getOtherBankSid())) {
+                                    }
+                                }
+                            }
+
+                        }else{
+                            if("月还".equals(v.getReceivablesName())){
+                                //推送间还认款记录
+                                LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
+                                historyEntity.setPlanDetailSid(planSid);
+                                historyEntity.setScheduleSid(planDetails.getScheduleSid());
+                                historyEntity.setSkdBillNo(finalConfirmation.getBillNo());
+                                historyEntity.setUpdateTime(new DateTime());
+                                historyEntity.setUpdateState("1");
+                                historyEntity.setDataTime(new DateTime());
+                                historyEntity.setBuckle("审核通过");
+                                historyEntity.setBuckleKey("003");
+                                historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                historyEntity.setReturnWay("间还");
+                                historyEntity.setReturnWayKey("02");
+                                if (null != planDetails.getPaymentMoney()) {
+                                    if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
+                                        BigDecimal paymentMoney = planDetails.getPaymentMoney();
+                                        String subscriptionMoney = v.getSubscriptionMoney();
+                                        BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
+                                        planDetails.setPaymentMoney(subtract);
+                                        loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
+                                        String orderSid = planDetails.getSalesOrderSid();
+                                        String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData();
+                                        String bankSid = "";
+                                        String scheduleSid = planDetails.getScheduleSid();
+                                        LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData();
+                                        if (isOther.equals("0")) {
+                                            if (StringUtils.isNotBlank(schedule.getBankSid())) {
+                                                bankSid = schedule.getBankSid();
+                                            }
+                                        } else if (isOther.equals("1")) {
+                                            if (StringUtils.isNotBlank(schedule.getOtherBankSid())) {
+                                                bankSid = schedule.getOtherBankSid();
+                                            }
+                                        }
+                                        ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid);
+                                        if (bankResultBean.getData() != null) {
+                                            LoanFinBank loanFinBank = bankResultBean.getData();
+                                            if (null != loanFinBank.getReAdvances()) {
+                                                if (loanFinBank.getReAdvances() == 1) {
+                                                    try {
+                                                        Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                                        historyEntity.setActualDate(collDate);
+                                                        if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                                            //未逾期
+                                                            Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                                            cal_1.setTime(planDetails.getDueDate());
+                                                            cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                                            historyEntity.setPrepareDate(cal_1.getTime());
+                                                        } else {
+                                                            //已逾期
+                                                            historyEntity.setPrepareDate(new DateTime());
+                                                        }
+                                                    } catch (ParseException e) {
+                                                        e.printStackTrace();
+                                                    }
+                                                    historyEntity.setPaymentState("待转付");
+                                                    historyEntity.setPaymentStateKey("001");
+                                                    FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                                                    jr.setCreateBySid(userSid);
+                                                    SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData();
+                                                    jr.setCreateByName(userVo.getName());
+                                                    jr.setBusSid(planSid);
+                                                    jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                                    jr.setReveivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                                    jr.setPayCostTitleKey("007");
+                                                    jr.setPayCostTitleValue("资方退还垫款");
+                                                    jr.setOrgSidPath(planDetails.getOrgSidPath());
+                                                    jr.setUseOrgName(planDetails.getUseOrgName());
+                                                    jr.setUseOrgSid(planDetails.getUseOrgSid());
+                                                    jr.setStaffDeptName(planDetails.getDept());
+                                                    jr.setStaffName(planDetails.getStaffName());
+                                                    jr.setStaffDeptSid(planDetails.getDeptSid());
+                                                    jr.setStaffUserSid(planDetails.getSalesUserSid());
+                                                    finUncollectedReceivablesDetailedJRService.insert(jr);
+                                                }
+                                            }
+                                        }
+                                    } else if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) {
+                                        try {
+                                            Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                            historyEntity.setActualDate(collDate);
+                                            if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                                //未逾期
+                                                Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                                cal_1.setTime(planDetails.getDueDate());
+                                                cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                                historyEntity.setPrepareDate(cal_1.getTime());
+                                            } else {
+                                                //已逾期
+                                                historyEntity.setPrepareDate(new DateTime());
+                                            }
+                                        } catch (ParseException e) {
+                                            e.printStackTrace();
+                                        }
+                                        historyEntity.setPaymentState("待转付");
+                                        historyEntity.setPaymentStateKey("001");
+                                    }
+                                } else {
+                                    try {
+                                        Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                        historyEntity.setActualDate(collDate);
+                                        if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                            //未逾期
+                                            Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                            cal_1.setTime(planDetails.getDueDate());
+                                            cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                            historyEntity.setPrepareDate(cal_1.getTime());
+                                        } else {
+                                            //已逾期
+                                            historyEntity.setPrepareDate(new DateTime());
+                                        }
+                                    } catch (ParseException e) {
+                                        e.printStackTrace();
+                                    }
+                                    historyEntity.setPaymentState("待转付");
+                                    historyEntity.setPaymentStateKey("001");
+                                }
+                                loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity);
+                            }else{
+                                if (null != planDetails.getPaymentInterest()) {
+                                    if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) {
+                                        BigDecimal paymentInterest = planDetails.getPaymentInterest();
+                                        String subscriptionMoney = v.getSubscriptionMoney();
+                                        BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
+                                        planDetails.setPaymentInterest(subtract);
+                                        BigDecimal paymentMoney = planDetails.getPaymentMoney();
+                                        BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
+                                        planDetails.setPaymentMoney(subtract2);
+                                        loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
+                                        String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData();
+                                        String bankSid = "";
+                                        String scheduleSid = planDetails.getScheduleSid();
+                                        LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData();
+                                        if (isOther.equals("0")) {
+                                            if (StringUtils.isNotBlank(schedule.getBankSid())) {
+                                                bankSid = schedule.getBankSid();
+                                            }
+                                        } else if (isOther.equals("1")) {
+                                            if (StringUtils.isNotBlank(schedule.getOtherBankSid())) {
                                                 bankSid = schedule.getOtherBankSid();
                                             }
                                         }
@@ -5455,6 +5782,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         list3.add(voucherResultDetailDtoDf);
                         if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
                             if("月还".equals(v.getReceivablesName())){
+                                //推送间还认款记录
+                                LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
+                                historyEntity.setPlanDetailSid(planSid);
+                                historyEntity.setScheduleSid(planDetails.getScheduleSid());
+                                historyEntity.setSkdBillNo(finalConfirmation.getBillNo());
+                                historyEntity.setUpdateTime(new DateTime());
+                                historyEntity.setUpdateState("1");
+                                historyEntity.setDataTime(new DateTime());
+                                historyEntity.setBuckle("审核通过");
+                                historyEntity.setBuckleKey("003");
+                                historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                historyEntity.setReturnWay("间还");
+                                historyEntity.setReturnWayKey("02");
                                 if (null != planDetails.getPaymentMoney()) {
                                     if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
                                         BigDecimal paymentMoney = planDetails.getPaymentMoney();
@@ -5462,8 +5802,104 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
                                         planDetails.setPaymentMoney(subtract);
                                         loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
+                                        String orderSid = planDetails.getSalesOrderSid();
+                                        String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData();
+                                        String bankSid = "";
+                                        String scheduleSid = planDetails.getScheduleSid();
+                                        LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData();
+                                        if (isOther.equals("0")) {
+                                            if (StringUtils.isNotBlank(schedule.getBankSid())) {
+                                                bankSid = schedule.getBankSid();
+                                            }
+                                        } else if (isOther.equals("1")) {
+                                            if (StringUtils.isNotBlank(schedule.getOtherBankSid())) {
+                                                bankSid = schedule.getOtherBankSid();
+                                            }
+                                        }
+                                        ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid);
+                                        if (bankResultBean.getData() != null) {
+                                            LoanFinBank loanFinBank = bankResultBean.getData();
+                                            if (null != loanFinBank.getReAdvances()) {
+                                                if (loanFinBank.getReAdvances() == 1) {
+                                                    try {
+                                                        Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                                        historyEntity.setActualDate(collDate);
+                                                        if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                                            //未逾期
+                                                            Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                                            cal_1.setTime(planDetails.getDueDate());
+                                                            cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                                            historyEntity.setPrepareDate(cal_1.getTime());
+                                                        } else {
+                                                            //已逾期
+                                                            historyEntity.setPrepareDate(new DateTime());
+                                                        }
+                                                    } catch (ParseException e) {
+                                                        e.printStackTrace();
+                                                    }
+                                                    historyEntity.setPaymentState("待转付");
+                                                    historyEntity.setPaymentStateKey("001");
+                                                    FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                                                    jr.setCreateBySid(userSid);
+                                                    SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData();
+                                                    jr.setCreateByName(userVo.getName());
+                                                    jr.setBusSid(planSid);
+                                                    jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                                    jr.setReveivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                                    jr.setPayCostTitleKey("007");
+                                                    jr.setPayCostTitleValue("资方退还垫款");
+                                                    jr.setOrgSidPath(planDetails.getOrgSidPath());
+                                                    jr.setUseOrgName(planDetails.getUseOrgName());
+                                                    jr.setUseOrgSid(planDetails.getUseOrgSid());
+                                                    jr.setStaffDeptName(planDetails.getDept());
+                                                    jr.setStaffName(planDetails.getStaffName());
+                                                    jr.setStaffDeptSid(planDetails.getDeptSid());
+                                                    jr.setStaffUserSid(planDetails.getSalesUserSid());
+                                                    finUncollectedReceivablesDetailedJRService.insert(jr);
+                                                }
+                                            }
+                                        }
+                                    } else if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) {
+                                        try {
+                                            Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                            historyEntity.setActualDate(collDate);
+                                            if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                                //未逾期
+                                                Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                                cal_1.setTime(planDetails.getDueDate());
+                                                cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                                historyEntity.setPrepareDate(cal_1.getTime());
+                                            } else {
+                                                //已逾期
+                                                historyEntity.setPrepareDate(new DateTime());
+                                            }
+                                        } catch (ParseException e) {
+                                            e.printStackTrace();
+                                        }
+                                        historyEntity.setPaymentState("待转付");
+                                        historyEntity.setPaymentStateKey("001");
                                     }
+                                } else {
+                                    try {
+                                        Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                        historyEntity.setActualDate(collDate);
+                                        if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                            //未逾期
+                                            Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                            cal_1.setTime(planDetails.getDueDate());
+                                            cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                            historyEntity.setPrepareDate(cal_1.getTime());
+                                        } else {
+                                            //已逾期
+                                            historyEntity.setPrepareDate(new DateTime());
+                                        }
+                                    } catch (ParseException e) {
+                                        e.printStackTrace();
+                                    }
+                                    historyEntity.setPaymentState("已转付");
+                                    historyEntity.setPaymentStateKey("003");
                                 }
+                                loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity);
                             }
                             if("资方逾期利息".equals(v.getReceivablesName())){
                                 if (null != planDetails.getPaymentInterest()) {
@@ -5652,38 +6088,147 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         }
                                     }
                                 }
-                            }
-                        }
-
-                    }
-
-
-
-
-                }else if("9".equals(busSalesOrderVehicle.getRiskState().toString())){//未交回立案
-                    //---------应收贷款车欠款_待处理欠款_诉讼车辆
-                    if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) {
-                        Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
-                        all4 = all4.add(new BigDecimal(v.getSubscriptionMoney()));
-                        voucherResultDetailDtoDf.setSummary(customerNumber+"诉讼回款");
-                        voucherResultDetailDtoDf.setSubjectNo("1201.03.03");
-                        //核算部门
-                        voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
-                        //核算客户
-                        voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
-                        voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
-                        list4.add(voucherResultDetailDtoDf);
-                        if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
-                            if("月还".equals(v.getReceivablesName())){
-                                if (null != planDetails.getPaymentMoney()) {
-                                    if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
-                                        BigDecimal paymentMoney = planDetails.getPaymentMoney();
-                                        String subscriptionMoney = v.getSubscriptionMoney();
-                                        BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
-                                        planDetails.setPaymentMoney(subtract);
-                                        loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
-                                    }
-                                }
+                            }
+                        }
+
+                    }
+
+
+
+
+                }else if("9".equals(busSalesOrderVehicle.getRiskState().toString())){//未交回立案
+                    //---------应收贷款车欠款_待处理欠款_诉讼车辆
+                    if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) {
+                        Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
+                        all4 = all4.add(new BigDecimal(v.getSubscriptionMoney()));
+                        voucherResultDetailDtoDf.setSummary(customerNumber+"诉讼回款");
+                        voucherResultDetailDtoDf.setSubjectNo("1201.03.03");
+                        //核算部门
+                        voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
+                        //核算客户
+                        voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
+                        list4.add(voucherResultDetailDtoDf);
+                        if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
+                            if("月还".equals(v.getReceivablesName())){
+                                //推送间还认款记录
+                                LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
+                                historyEntity.setPlanDetailSid(planSid);
+                                historyEntity.setScheduleSid(planDetails.getScheduleSid());
+                                historyEntity.setSkdBillNo(finalConfirmation.getBillNo());
+                                historyEntity.setUpdateTime(new DateTime());
+                                historyEntity.setUpdateState("1");
+                                historyEntity.setDataTime(new DateTime());
+                                historyEntity.setBuckle("审核通过");
+                                historyEntity.setBuckleKey("003");
+                                historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                historyEntity.setReturnWay("间还");
+                                historyEntity.setReturnWayKey("02");
+                                if (null != planDetails.getPaymentMoney()) {
+                                    if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
+                                        BigDecimal paymentMoney = planDetails.getPaymentMoney();
+                                        String subscriptionMoney = v.getSubscriptionMoney();
+                                        BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
+                                        planDetails.setPaymentMoney(subtract);
+                                        loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
+                                        String orderSid = planDetails.getSalesOrderSid();
+                                        String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData();
+                                        String bankSid = "";
+                                        String scheduleSid = planDetails.getScheduleSid();
+                                        LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData();
+                                        if (isOther.equals("0")) {
+                                            if (StringUtils.isNotBlank(schedule.getBankSid())) {
+                                                bankSid = schedule.getBankSid();
+                                            }
+                                        } else if (isOther.equals("1")) {
+                                            if (StringUtils.isNotBlank(schedule.getOtherBankSid())) {
+                                                bankSid = schedule.getOtherBankSid();
+                                            }
+                                        }
+                                        ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid);
+                                        if (bankResultBean.getData() != null) {
+                                            LoanFinBank loanFinBank = bankResultBean.getData();
+                                            if (null != loanFinBank.getReAdvances()) {
+                                                if (loanFinBank.getReAdvances() == 1) {
+                                                    try {
+                                                        Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                                        historyEntity.setActualDate(collDate);
+                                                        if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                                            //未逾期
+                                                            Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                                            cal_1.setTime(planDetails.getDueDate());
+                                                            cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                                            historyEntity.setPrepareDate(cal_1.getTime());
+                                                        } else {
+                                                            //已逾期
+                                                            historyEntity.setPrepareDate(new DateTime());
+                                                        }
+                                                    } catch (ParseException e) {
+                                                        e.printStackTrace();
+                                                    }
+                                                    historyEntity.setPaymentState("待转付");
+                                                    historyEntity.setPaymentStateKey("001");
+                                                    FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                                                    jr.setCreateBySid(userSid);
+                                                    SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData();
+                                                    jr.setCreateByName(userVo.getName());
+                                                    jr.setBusSid(planSid);
+                                                    jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                                    jr.setReveivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                                    jr.setPayCostTitleKey("007");
+                                                    jr.setPayCostTitleValue("资方退还垫款");
+                                                    jr.setOrgSidPath(planDetails.getOrgSidPath());
+                                                    jr.setUseOrgName(planDetails.getUseOrgName());
+                                                    jr.setUseOrgSid(planDetails.getUseOrgSid());
+                                                    jr.setStaffDeptName(planDetails.getDept());
+                                                    jr.setStaffName(planDetails.getStaffName());
+                                                    jr.setStaffDeptSid(planDetails.getDeptSid());
+                                                    jr.setStaffUserSid(planDetails.getSalesUserSid());
+                                                    finUncollectedReceivablesDetailedJRService.insert(jr);
+                                                }
+                                            }
+                                        }
+                                    } else if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) {
+                                        try {
+                                            Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                            historyEntity.setActualDate(collDate);
+                                            if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                                //未逾期
+                                                Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                                cal_1.setTime(planDetails.getDueDate());
+                                                cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                                historyEntity.setPrepareDate(cal_1.getTime());
+                                            } else {
+                                                //已逾期
+                                                historyEntity.setPrepareDate(new DateTime());
+                                            }
+                                        } catch (ParseException e) {
+                                            e.printStackTrace();
+                                        }
+                                        historyEntity.setPaymentState("待转付");
+                                        historyEntity.setPaymentStateKey("001");
+                                    }
+                                } else {
+                                    try {
+                                        Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                        historyEntity.setActualDate(collDate);
+                                        if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                            //未逾期
+                                            Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                            cal_1.setTime(planDetails.getDueDate());
+                                            cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                            historyEntity.setPrepareDate(cal_1.getTime());
+                                        } else {
+                                            //已逾期
+                                            historyEntity.setPrepareDate(new DateTime());
+                                        }
+                                    } catch (ParseException e) {
+                                        e.printStackTrace();
+                                    }
+                                    historyEntity.setPaymentState("已转付");
+                                    historyEntity.setPaymentStateKey("003");
+                                }
+                                loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity);
                             }
                             if("资方逾期利息".equals(v.getReceivablesName())){
                                 if (null != planDetails.getPaymentInterest()) {
@@ -6028,6 +6573,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         list5.add(voucherResultDetailDtoDf);
                         if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
                             if("月还".equals(v.getReceivablesName())){
+                                //推送间还认款记录
+                                LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
+                                historyEntity.setPlanDetailSid(planSid);
+                                historyEntity.setScheduleSid(planDetails.getScheduleSid());
+                                historyEntity.setSkdBillNo(finalConfirmation.getBillNo());
+                                historyEntity.setUpdateTime(new DateTime());
+                                historyEntity.setUpdateState("1");
+                                historyEntity.setDataTime(new DateTime());
+                                historyEntity.setBuckle("审核通过");
+                                historyEntity.setBuckleKey("003");
+                                historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                historyEntity.setReturnWay("间还");
+                                historyEntity.setReturnWayKey("02");
                                 if (null != planDetails.getPaymentMoney()) {
                                     if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
                                         BigDecimal paymentMoney = planDetails.getPaymentMoney();
@@ -6035,8 +6593,104 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
                                         planDetails.setPaymentMoney(subtract);
                                         loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
+                                        String orderSid = planDetails.getSalesOrderSid();
+                                        String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData();
+                                        String bankSid = "";
+                                        String scheduleSid = planDetails.getScheduleSid();
+                                        LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData();
+                                        if (isOther.equals("0")) {
+                                            if (StringUtils.isNotBlank(schedule.getBankSid())) {
+                                                bankSid = schedule.getBankSid();
+                                            }
+                                        } else if (isOther.equals("1")) {
+                                            if (StringUtils.isNotBlank(schedule.getOtherBankSid())) {
+                                                bankSid = schedule.getOtherBankSid();
+                                            }
+                                        }
+                                        ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid);
+                                        if (bankResultBean.getData() != null) {
+                                            LoanFinBank loanFinBank = bankResultBean.getData();
+                                            if (null != loanFinBank.getReAdvances()) {
+                                                if (loanFinBank.getReAdvances() == 1) {
+                                                    try {
+                                                        Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                                        historyEntity.setActualDate(collDate);
+                                                        if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                                            //未逾期
+                                                            Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                                            cal_1.setTime(planDetails.getDueDate());
+                                                            cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                                            historyEntity.setPrepareDate(cal_1.getTime());
+                                                        } else {
+                                                            //已逾期
+                                                            historyEntity.setPrepareDate(new DateTime());
+                                                        }
+                                                    } catch (ParseException e) {
+                                                        e.printStackTrace();
+                                                    }
+                                                    historyEntity.setPaymentState("待转付");
+                                                    historyEntity.setPaymentStateKey("001");
+                                                    FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                                                    jr.setCreateBySid(userSid);
+                                                    SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData();
+                                                    jr.setCreateByName(userVo.getName());
+                                                    jr.setBusSid(planSid);
+                                                    jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                                    jr.setReveivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                                    jr.setPayCostTitleKey("007");
+                                                    jr.setPayCostTitleValue("资方退还垫款");
+                                                    jr.setOrgSidPath(planDetails.getOrgSidPath());
+                                                    jr.setUseOrgName(planDetails.getUseOrgName());
+                                                    jr.setUseOrgSid(planDetails.getUseOrgSid());
+                                                    jr.setStaffDeptName(planDetails.getDept());
+                                                    jr.setStaffName(planDetails.getStaffName());
+                                                    jr.setStaffDeptSid(planDetails.getDeptSid());
+                                                    jr.setStaffUserSid(planDetails.getSalesUserSid());
+                                                    finUncollectedReceivablesDetailedJRService.insert(jr);
+                                                }
+                                            }
+                                        }
+                                    } else if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) {
+                                        try {
+                                            Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                            historyEntity.setActualDate(collDate);
+                                            if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                                //未逾期
+                                                Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                                cal_1.setTime(planDetails.getDueDate());
+                                                cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                                historyEntity.setPrepareDate(cal_1.getTime());
+                                            } else {
+                                                //已逾期
+                                                historyEntity.setPrepareDate(new DateTime());
+                                            }
+                                        } catch (ParseException e) {
+                                            e.printStackTrace();
+                                        }
+                                        historyEntity.setPaymentState("待转付");
+                                        historyEntity.setPaymentStateKey("001");
+                                    }
+                                } else {
+                                    try {
+                                        Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                        historyEntity.setActualDate(collDate);
+                                        if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                            //未逾期
+                                            Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                            cal_1.setTime(planDetails.getDueDate());
+                                            cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                            historyEntity.setPrepareDate(cal_1.getTime());
+                                        } else {
+                                            //已逾期
+                                            historyEntity.setPrepareDate(new DateTime());
+                                        }
+                                    } catch (ParseException e) {
+                                        e.printStackTrace();
                                     }
+                                    historyEntity.setPaymentState("已转付");
+                                    historyEntity.setPaymentStateKey("003");
                                 }
+                                loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity);
                             }
                             if("资方逾期利息".equals(v.getReceivablesName())){
                                 if (null != planDetails.getPaymentInterest()) {
@@ -6243,6 +6897,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         list6.add(voucherResultDetailDtoDf);
                         if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//回购
                             if("月还".equals(v.getReceivablesName())){
+                                //推送间还认款记录
+                                LoanRepaymentHistory historyEntity = new LoanRepaymentHistory();
+                                historyEntity.setPlanDetailSid(planSid);
+                                historyEntity.setScheduleSid(planDetails.getScheduleSid());
+                                historyEntity.setSkdBillNo(finalConfirmation.getBillNo());
+                                historyEntity.setUpdateTime(new DateTime());
+                                historyEntity.setUpdateState("1");
+                                historyEntity.setDataTime(new DateTime());
+                                historyEntity.setBuckle("审核通过");
+                                historyEntity.setBuckleKey("003");
+                                historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                historyEntity.setReturnWay("间还");
+                                historyEntity.setReturnWayKey("02");
                                 if (null != planDetails.getPaymentMoney()) {
                                     if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
                                         BigDecimal paymentMoney = planDetails.getPaymentMoney();
@@ -6250,8 +6917,104 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
                                         planDetails.setPaymentMoney(subtract);
                                         loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
+                                        String orderSid = planDetails.getSalesOrderSid();
+                                        String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData();
+                                        String bankSid = "";
+                                        String scheduleSid = planDetails.getScheduleSid();
+                                        LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData();
+                                        if (isOther.equals("0")) {
+                                            if (StringUtils.isNotBlank(schedule.getBankSid())) {
+                                                bankSid = schedule.getBankSid();
+                                            }
+                                        } else if (isOther.equals("1")) {
+                                            if (StringUtils.isNotBlank(schedule.getOtherBankSid())) {
+                                                bankSid = schedule.getOtherBankSid();
+                                            }
+                                        }
+                                        ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid);
+                                        if (bankResultBean.getData() != null) {
+                                            LoanFinBank loanFinBank = bankResultBean.getData();
+                                            if (null != loanFinBank.getReAdvances()) {
+                                                if (loanFinBank.getReAdvances() == 1) {
+                                                    try {
+                                                        Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                                        historyEntity.setActualDate(collDate);
+                                                        if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                                            //未逾期
+                                                            Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                                            cal_1.setTime(planDetails.getDueDate());
+                                                            cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                                            historyEntity.setPrepareDate(cal_1.getTime());
+                                                        } else {
+                                                            //已逾期
+                                                            historyEntity.setPrepareDate(new DateTime());
+                                                        }
+                                                    } catch (ParseException e) {
+                                                        e.printStackTrace();
+                                                    }
+                                                    historyEntity.setPaymentState("待转付");
+                                                    historyEntity.setPaymentStateKey("001");
+                                                    FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                                                    jr.setCreateBySid(userSid);
+                                                    SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData();
+                                                    jr.setCreateByName(userVo.getName());
+                                                    jr.setBusSid(planSid);
+                                                    jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                                    jr.setReveivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                                    jr.setPayCostTitleKey("007");
+                                                    jr.setPayCostTitleValue("资方退还垫款");
+                                                    jr.setOrgSidPath(planDetails.getOrgSidPath());
+                                                    jr.setUseOrgName(planDetails.getUseOrgName());
+                                                    jr.setUseOrgSid(planDetails.getUseOrgSid());
+                                                    jr.setStaffDeptName(planDetails.getDept());
+                                                    jr.setStaffName(planDetails.getStaffName());
+                                                    jr.setStaffDeptSid(planDetails.getDeptSid());
+                                                    jr.setStaffUserSid(planDetails.getSalesUserSid());
+                                                    finUncollectedReceivablesDetailedJRService.insert(jr);
+                                                }
+                                            }
+                                        }
+                                    } else if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) {
+                                        try {
+                                            Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                            historyEntity.setActualDate(collDate);
+                                            if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                                //未逾期
+                                                Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                                cal_1.setTime(planDetails.getDueDate());
+                                                cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                                historyEntity.setPrepareDate(cal_1.getTime());
+                                            } else {
+                                                //已逾期
+                                                historyEntity.setPrepareDate(new DateTime());
+                                            }
+                                        } catch (ParseException e) {
+                                            e.printStackTrace();
+                                        }
+                                        historyEntity.setPaymentState("待转付");
+                                        historyEntity.setPaymentStateKey("001");
+                                    }
+                                } else {
+                                    try {
+                                        Date collDate = sdf.parse(finalConfirmation.getCollectionDate());
+                                        historyEntity.setActualDate(collDate);
+                                        if (planDetails.getDueDate().compareTo(collDate) > 0) {
+                                            //未逾期
+                                            Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历
+                                            cal_1.setTime(planDetails.getDueDate());
+                                            cal_1.add(Calendar.DAY_OF_MONTH, -1);
+                                            historyEntity.setPrepareDate(cal_1.getTime());
+                                        } else {
+                                            //已逾期
+                                            historyEntity.setPrepareDate(new DateTime());
+                                        }
+                                    } catch (ParseException e) {
+                                        e.printStackTrace();
                                     }
+                                    historyEntity.setPaymentState("已转付");
+                                    historyEntity.setPaymentStateKey("003");
                                 }
+                                loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity);
                             }
                             if("资方逾期利息".equals(v.getReceivablesName())){
                                 if (null != planDetails.getPaymentInterest()) {