完善转累欠凭证推送

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanPlanDetailsVoForLateVoucher.java

@@ -16,4 +16,5 @@ public class LoanPlanDetailsVoForLateVoucher {
     private String deptSid;
     private String busVinSid;
     private String salesOrderSid;
+    private String loanContractNo;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -856,11 +856,11 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         List<LoanPlanDetailsVoForLateVoucher> records = loanRepaymentPlanDetailsService.selListForLateVoucher(pushUseOrgSid);
         List<String> planSids = new ArrayList<>();
         if (!records.isEmpty()) {
+            GeneralVoucher generalVoucher = new GeneralVoucher();
+            List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
             for (LoanPlanDetailsVoForLateVoucher planDetails : records) {
                 if (null != planDetails) {
                     planSids.add(planDetails.getPlanSid());
-                    GeneralVoucher generalVoucher = new GeneralVoucher();
-                    List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                     if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) {
                         String useOrgSid = planDetails.getUseOrgSid();
@@ -876,58 +876,16 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                             voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
                         }
                     }
-                    if (StringUtils.isNotBlank(planDetails.getBusVinSid())) {
+                    String[] split = planDetails.getLoanContractNo().split("-");
-                        String busVinSid = planDetails.getBusVinSid();
+                    voucherDetail.setCustomerCode(split[0] + split[1]);
-                        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
-                        if (null != busSalesOrderVehicle) {
-                            String customerNumber = "";
-                            //判断财务系统是否有客户
-                            Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
-                            String linkNo = "";
-                            BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
-                            if (!aBoolean) {
-                                //  List<BdCustomer> bdCustomers = new ArrayList<>();
-                                BdCustomer bdCustomer = new BdCustomer();
-                                bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
-                                String salesOrderSid = planDetails.getSalesOrderSid();
-                                BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData();
-                                bdCustomer.setFShortName(salesOrder.getContractNo());
-                                BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
-                                bdCustomer.setTOrgIds(data.getOrgCode());
-                                if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
-                                    String vinNo = busSalesOrderVehicle.getLinkNo();
-                                    if (vinNo.length() > 8) {
-                                        linkNo = vinNo.substring(vinNo.length() - 8);
-                                    } else {
-                                        linkNo = busSalesOrderVehicle.getLinkNo();
-                                    }
-                                    if (null != borrowerDetailsVo) {
-                                        bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
-                                    }
-                                } else {
-                                    if (null != borrowerDetailsVo) {
-                                        bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
-                                    }
-                                }
-                                //  bdCustomers.add(bdCustomer);
-                                ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
-                                if (resultBean.getSuccess()) {
-                                    customerNumber = bdCustomer.getFNumber();
-                                }
-                            } else {
-                                customerNumber = busSalesOrderVehicle.getTemporaryNo();
-                            }
-                            voucherDetail.setCustomerCode(customerNumber);
-                        }
-                    }
                     if (StringUtils.isNotBlank(planDetails.getOutstandingMoney())) {
                         voucherDetail.setAmount(new BigDecimal(planDetails.getOutstandingMoney()));
                     }
                     voucherDetails.add(voucherDetail);
-                    generalVoucher.setVoucherDetails(voucherDetails);
-                    finKingDeeFeign.saveLateVoucher(generalVoucher);
                 }
             }
+            generalVoucher.setVoucherDetails(voucherDetails);
+            finKingDeeFeign.saveLateVoucher(generalVoucher);
         }
         if (!planSids.isEmpty()) {
             int i = loanRepaymentPlanDetailsService.updateOweState(planSids);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -255,6 +255,7 @@
     <select id="selListForLateVoucher"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForLateVoucher">
         SELECT
+        b.loanContractNo,
         b.sid AS planSid,
         CASE
         WHEN ( b.outstandingMoney + b.bankBeInter + b.fund ) >
@@ -275,6 +276,7 @@
         FROM
         (
         SELECT
+        pd.loanContractNo,
         pd.oweState,
         pd.dueDate,
         pd.useOrgSid,