Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java

@@ -12,6 +12,7 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
@@ -770,14 +771,30 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                         }
                     }
                 }
-                if (!voucherDetails.isEmpty()) {
+                try {
-                    generalVoucher.setVoucherDetails(voucherDetails);
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-                    finKingDeeFeign.saveLateVoucher(generalVoucher);
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                            0L, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    Future future1 = pool.submit(() -> {
+                        if (!voucherDetails.isEmpty()) {
+                            generalVoucher.setVoucherDetails(voucherDetails);
+                            finKingDeeFeign.saveLateVoucher(generalVoucher);
+                        }
+                    });
+                    Future future2 = pool.submit(() -> {
+                        if (!planSids.isEmpty()) {
+                            int i = loanRepaymentPlanDetailsService.updateOweState(planSids);
+                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
+
+
             }
-            if (!planSids.isEmpty()) {
+
-                int i = loanRepaymentPlanDetailsService.updateOweState(planSids);
-            }
         }
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java

@@ -597,11 +597,11 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
                         busVinStateSetQuery.setState(1);
                         ResultBean resultBean2 = busSalesOrderVehicleFeign.setFundState(busVinStateSetQuery);
 
-                    }else if("二次转租".equals(loanOutboundApply.getDisposal())){
+                    }/*else if("二次转租".equals(loanOutboundApply.getDisposal())){
                         busVinStateSetQuery.setState(3);
                         ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
-                    }else if("二次销售".equals(loanOutboundApply.getDisposal())){
+                    }*/else if("二次销售".equals(loanOutboundApply.getDisposal())){
-
+                        //ToDo:
                     }