完善代付款凭证推送

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java

@@ -783,14 +783,14 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
     private void pushPaymentVoucher(String businessSid) {
         List<LoanTransferPaymentRecord> records = loanTransferPaymentRecordService.selByMainSid(businessSid);
         if (!records.isEmpty()) {
+            PaymentVoucher paymentVoucher = new PaymentVoucher();
+            List<PaymentVoucher.PaymentVoucherDetail> voucherDetails = new ArrayList<>();
             for (LoanTransferPaymentRecord v : records) {
                 LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(v.getRepaymentHistorySid());
                 if (null != repaymentHistory) {
                     String planDetailSid = repaymentHistory.getPlanDetailSid();
                     LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(planDetailSid);
                     if (null != planDetails) {
-                        PaymentVoucher paymentVoucher = new PaymentVoucher();
-                        List<PaymentVoucher.PaymentVoucherDetail> voucherDetails = new ArrayList<>();
                         PaymentVoucher.PaymentVoucherDetail voucherDetail = new PaymentVoucher.PaymentVoucherDetail();
                         if (null != planDetails.getPaymentMoney()) {
                             if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) > 0) {
@@ -823,48 +823,8 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
                         if (null != organizationDeptVo) {
                             voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
                         }
-                        String busVinSid = planDetails.getBusVinSid();
-                        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);
-                        }
+                        String[] split = planDetails.getLoanContractNo().split("-");
+                        voucherDetail.setCustomerCode(split[0] + split[1]);
                         BigDecimal money = new BigDecimal(0);
                         if (null != v.getTransferPrincipal()) {
                             money = v.getTransferPrincipal();
@@ -874,11 +834,12 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
                         }
                         voucherDetail.setAmount(money);
                         voucherDetails.add(voucherDetail);
-                        paymentVoucher.setVoucherDetails(voucherDetails);
-                        finKingDeeFeign.savePaymentVoucher(paymentVoucher);
+
                     }
                 }
             }
+            paymentVoucher.setVoucherDetails(voucherDetails);
+            finKingDeeFeign.savePaymentVoucher(paymentVoucher);
         }
     }