diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java
index ea16e9b431..40e671cef8 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java
@@ -617,14 +617,37 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
                 //修改销售订单车辆表风控状态和资金占用费状态
                 BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
                 List<String> busVinSidList = loanOutboundVehService.selectByMainSid(businessSid);
+                List<String> busVinSidJh = new ArrayList<>();//非诉讼立案且非执行
                 if(!busVinSidList.isEmpty()){
                     busVinStateSetQuery.setBusVinSidList(busVinSidList);
+                    for (int j = 0; j < busVinSidList.size(); j++) {
+                        String busVinSid = busVinSidList.get(j);
+                        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(busVinSid).getData();
+                        if(!"9".equals(busSalesOrderVehicle.getRiskState().toString()) && !"10".equals(busSalesOrderVehicle.getRiskState().toString())){
+                            busVinSidJh.add(busVinSid);
+                        }
+                    }
+                    if(!busVinSidJh.isEmpty()){
+                        busVinStateSetQuery.setBusVinSidList(busVinSidJh);
+                        if("客户赎回".equals(loanOutboundApply.getDisposal())){
+                            busVinStateSetQuery.setState(0);//修改为正常
+                            ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
+                        }else if("二次转租".equals(loanOutboundApply.getDisposal())){
+                            busVinStateSetQuery.setState(0);//修改为正常
+                            ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
+                        }else if("二次销售".equals(loanOutboundApply.getDisposal())){
+                            LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostService.selectMainSu(loanOutboundApply.getApplySid());
+                            if(loanSecondarySalesCost.getIsRecovery() != null){
+                                if(loanSecondarySalesCost.getIsRecovery() == 0){//不追偿
+                                    busVinStateSetQuery.setState(8);//不追偿
+                                }else{//追偿
+                                    busVinStateSetQuery.setState(7);//处置损失
+                                }
+                                ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
+                            }
+                        }
+                    }
                     if("客户赎回".equals(loanOutboundApply.getDisposal())){
-//                        busVinStateSetQuery.setState(2);
-                        busVinStateSetQuery.setState(0);//修改为正常
-                        ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
-                        busVinStateSetQuery.setState(1);
-                        ResultBean resultBean2 = busSalesOrderVehicleFeign.setFundState(busVinStateSetQuery);
                         //推送金蝶财务其他出库单
                         try {
                             ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@@ -648,9 +671,6 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
                         }
 
                     }else if("二次转租".equals(loanOutboundApply.getDisposal())){
-//                        busVinStateSetQuery.setState(3);
-                        busVinStateSetQuery.setState(0);//修改为正常
-                        ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
                         //推送金蝶财务其他出库单--二次转租推送的凭证与赎回推送的凭证一样
                         try {
                             ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@@ -673,17 +693,6 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
                             e.printStackTrace();
                         }
                     }else if("二次销售".equals(loanOutboundApply.getDisposal())){
-                        LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostService.selectMainSu(loanOutboundApply.getApplySid());
-                        if(loanSecondarySalesCost.getIsRecovery() != null){
-                            if(loanSecondarySalesCost.getIsRecovery() == 0){//不追偿
-                                busVinStateSetQuery.setState(8);//不追偿
-                            }else{//追偿
-                                busVinStateSetQuery.setState(7);//处置损失
-                            }
-                            ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
-                        }
-
-                        //ToDo:
                         //推送金蝶财务其他出库单
                         try {
                             ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@@ -705,16 +714,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
-
-
-
                     }
-
-
-
-
-
-
                 }
                 LoanOutboundApply outboundApply = fetchBySid(businessSid);
                 outboundApply.setClosingDate(new DateTime());
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java
index c1892f1477..f46aa67fab 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java
@@ -797,6 +797,7 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                 BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
                 List<String> busVinSidList = redemptionVinLists.stream().map(v->v.getBusVinSid()).collect(Collectors.toList());
                 busVinStateSetQuery.setState(4);//客户赎回中
+                busVinStateSetQuery.setBusVinSidList(busVinSidList);
                 ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
                 //--------更新风控状态结束
                 FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = new FinUncollectedReceivablesDetailedJR();
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
index 378a7228e8..37c8c6bf11 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
@@ -738,7 +738,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                 LoanRepurchaseApply repurchaseApply = fetchBySid(businessSid);
                 repurchaseApply.setCloseDate(new DateTime());
                 baseMapper.updateById(repurchaseApply);
-                //更新车辆表回购状态
+                //更新车辆表回购状态为1
                 baseMapper.updateBus(repurchaseApply.getBusVinSid());
 
                 try {
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java
index bff9644892..85ab66e300 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java
@@ -723,6 +723,10 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
         BigDecimal bjMoney = BigDecimal.ZERO;
         String lq = loanRepaymentPlanDetailsService.getYqLq(loanReturnInboundApply.getBusVinSid());
         lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
+        if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
+            //查询回购的资方费用
+
+        }
         //未到期欠款
         String wdq = loanRepaymentPlanDetailsService.getWdq(loanReturnInboundApply.getBusVinSid());
         wdqMoney = wdqMoney.add(new BigDecimal(StringUtils.isBlank(wdq) ? "0" : wdq));
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
index 12dccbbd2d..28128377dd 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
@@ -559,8 +559,20 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                 //--更新销售订单车辆表的风控状态为二次销售中
                 BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
                 List<String> busVinSidList = list.stream().map(v->v.getBusVinSid()).collect(Collectors.toList());
-                busVinStateSetQuery.setState(5);//二次销售中
-                ResultBean resultBeanss = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
+                List<String> busVinSidJhList = new ArrayList<>();
+                for (int i = 0; i < busVinSidList.size(); i++) {
+                    String busVinSid = busVinSidList.get(i);
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(busVinSid).getData();
+                    if("1".equals(busSalesOrderVehicle.getRiskState().toString())){
+                        busVinSidJhList.add(busVinSid);
+                    }
+                }
+                if(!busVinSidJhList.isEmpty()){
+                    busVinStateSetQuery.setBusVinSidList(busVinSidJhList);
+                    busVinStateSetQuery.setState(5);//二次销售中
+                    ResultBean resultBeanss = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
+                }
+
                 //--------更新风控状态结束
 
                 DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyService.java
index 3b7d0fc212..009433fe15 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyService.java
@@ -703,6 +703,7 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa
                 BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
                 List<String> busVinSidList = subletVinLists.stream().map(v->v.getBusVinSid()).collect(Collectors.toList());
                 busVinStateSetQuery.setState(6);//二次转租中
+                busVinStateSetQuery.setBusVinSidList(busVinSidList);
                 ResultBean resultBeanss = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()