Merge remote-tracking branch 'origin/master'

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

@@ -666,8 +666,20 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                         }
                     }
                 }
-                //推送划扣凭证
-                pushBuckleVoucher(businessSid);
+
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .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(() -> {
+                        //推送划扣凭证
+                        pushBuckleVoucher(businessSid);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 //推送转累欠凭证
                 pushLaterBuckleVoucher(businessSid);
             } else {
@@ -771,6 +783,9 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                         }
                     }
                 }
+                if (!planSids.isEmpty()) {
+                    int i = loanRepaymentPlanDetailsService.updateOweState(planSids);
+                }
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                             .setNameFormat("demo-pool-%d").build();
@@ -783,11 +798,6 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                             finKingDeeFeign.saveLateVoucher(generalVoucher);
                         }
                     });
-                    Future future2 = pool.submit(() -> {
-                        if (!planSids.isEmpty()) {
-                            int i = loanRepaymentPlanDetailsService.updateOweState(planSids);
-                        }
-                    });
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -49,6 +49,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
 import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
@@ -67,6 +68,7 @@ import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleDto;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanvoucher.RskPaymentVoucher;
 import com.yxt.anrui.riskcenter.api.loanvoucher.RskVoucher;
+import com.yxt.anrui.riskcenter.biz.loanfinbank.LoanFinBankService;
 import com.yxt.anrui.riskcenter.biz.loanpushfundhistory.LoanPushFundHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
@@ -196,6 +198,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
     private DictCommonFeign dictCommonFeign;
     @Autowired
     private LoanPushFundHistoryService loanPushFundHistoryService;
+    @Autowired
+    private LoanFinBankService loanFinBankService;
 
 
     public PagerVo<LoanSettleApplyVo> listPageVo(PagerQuery<LoanSettleApplyQuery> pq) {
@@ -2484,6 +2488,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                         voucherDetail1.setDebit(bbjDDMoney.toString());
                         resultDetails.add(voucherDetail1);
                         Voucher.VoucherResultDetailDto voucherDetail2 = new Voucher.VoucherResultDetailDto();
+                        String bankSid = loanSettleApply.getBankSid();
+                        LoanFinBank loanFinBank = loanFinBankService.fetchBySid(bankSid);
+                        if(loanFinBank != null){
+                            voucherDetail2.setBank(loanFinBank.getBankNo());
+                        }
                         voucherDetail2.setSummary(planDetails.getBankName() + "个贷保证金抵结清款");
                         voucherDetail2.setSubjectNo("1009.01.00");
                         voucherDetail2.setDimensionDept(deptCode);