客服系统交易凭证添加合同

src/main/java/cn/quantgroup/customer/rest/vo/transaction/TransactionReceiptVO.java

@@ -26,5 +26,5 @@ public class TransactionReceiptVO {
     /**
      * 贷款信息
      */
-    private List<LoanVO> loanList;
+    private LoanVO loan;
 }

src/main/java/cn/quantgroup/customer/service/impl/TransactionReceiptRecordServiceImpl.java

@@ -449,20 +449,19 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
                 throw new RuntimeException("导出文件出错了");
             }
         }
-        sftpUtil.logout();
+//        sftpUtil.logout();
         log.info("uploadFile | 断开ftp");
         log.info("[TransactionReceiptRecordServiceImpl.kdspOperationUrl  调用kdsp-op 接口end]");
-        if(CollectionUtils.isEmpty(emailList)){
-            log.info("没有签章成功的文件可以发送");
+        if(!CollectionUtils.isEmpty(emailList)){
+            //发送邮件通知已经处理完成
+            log.info("[TransactionReceiptRecordServiceImpl.sendCustomerTransactionHtmlMail  发送邮件begin]");
+            sendCustomerTransactionHtmlMail(transactionReceiptRecordList.size(),emailList.size(),transactionReceiptRecordList.size()-emailList.size());
+            log.info("[TransactionReceiptRecordServiceImpl.sendCustomerTransactionHtmlMail  发送邮件end]");
             deleteRedis("exportZipFile");
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            throw new RuntimeException("没有签章成功的文件可以发送");
+//            throw new RuntimeException("没有签章成功的文件可以发送");
         }
 
-        //发送邮件通知已经处理完成
-        log.info("[TransactionReceiptRecordServiceImpl.sendCustomerTransactionHtmlMail  发送邮件begin]");
-        sendCustomerTransactionHtmlMail(transactionReceiptRecordList.size(),emailList.size(),transactionReceiptRecordList.size()-emailList.size());
-        log.info("[TransactionReceiptRecordServiceImpl.sendCustomerTransactionHtmlMail  发送邮件end]");
         deleteRedis("exportZipFile");
     }
 
@@ -769,7 +768,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
         //物流信息
         List<LogisticsVO> logisticsVOList = transactionReceiptVO.getLogisticsList();
         // 贷款信息
-        List<LoanVO> loanVOList = transactionReceiptVO.getLoanList();
+        LoanVO loanVo = transactionReceiptVO.getLoan();
         log.info("generatePDF 开始生成pdf begin",LOG_PRE,filePath);
         Document document = new Document(PageSize.A4);
         try {
@@ -858,8 +857,8 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
             //贷款信息详情
             table.addCell(new Phrase(ITextPDFUtil.getUTF8String("合同编号/贷字"), font));
             //todo: 贷款信息只有一个,选择？
-            for (LoanVO loanVO : loanVOList) {
-                cell = new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(loanVO.getContractNo())?"":loanVO.getContractNo()), font));
+            if (loanVo != null) {
+                cell = new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(loanVo.getContractNo())?"":loanVo.getContractNo()), font));
                 cell.setColspan(5);
                 cell.setMinimumHeight(18);
                 table.addCell(cell);