导出凭证

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

@@ -8,9 +8,5 @@ public class LoanVO {
      * 合同号
      */
     private String contractNo;
-    /**
-     * 贷字
-     */
-    private String loanNo;
 
 }

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

@@ -66,4 +66,19 @@ public class OrderVO {
      */
     private String payTypeName;
 
+    /**
+     *  vcc支付金额
+     */
+    private String vccPayAmount;
+
+    /**
+     * 其他方式支付金额
+     */
+    private String otherPayAmount;
+
+    /**
+     * 合同号
+     */
+    private String contractNo;
+
 }

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

@@ -825,6 +825,20 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
             table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(orderVO.getOrderAmount())?"":orderVO.getOrderAmount()), font))).setMinimumHeight(18);
             table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(orderVO.getPayAmount())?"/":orderVO.getPayAmount()), font))).setMinimumHeight(18);
             table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(orderVO.getPayTypeName())?"/":orderVO.getPayTypeName()), font))).setMinimumHeight(18);
+            // 第六行数据
+            table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String("享花卡支付"), font))).setMinimumHeight(18);
+            table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String("其他方式支付"), font))).setMinimumHeight(18);
+            table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(""), font))).setMinimumHeight(18);
+            table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(""), font))).setMinimumHeight(18);
+            table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(""), font))).setMinimumHeight(18);
+            table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(""), font))).setMinimumHeight(18);
+            // 第七行数据
+            table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(orderVO.getVccPayAmount())?"0":orderVO.getVccPayAmount()), font))).setMinimumHeight(18);
+            table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(orderVO.getOtherPayAmount())?"0":orderVO.getOtherPayAmount()), font))).setMinimumHeight(18);
+            table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(""), font))).setMinimumHeight(18);
+            table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(""), font))).setMinimumHeight(18);
+            table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(""), font))).setMinimumHeight(18);
+            table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(""), font))).setMinimumHeight(18);
             //有多个物流信息,重复展示物流信息，商品信息，收货信息，物流详情
             log.info("生成pdf 物流信息logisticsVOList"+logisticsVOList.size());
             if(logisticsVOList.size() > 1){
@@ -842,14 +856,13 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
             cell.setMinimumHeight(18);
             table.addCell(cell);
             //贷款信息详情
-            table.addCell(new Phrase(ITextPDFUtil.getUTF8String("合同编号"), font));
-            cell = new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String("贷字"), font));
+            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));
                 cell.setColspan(5);
                 cell.setMinimumHeight(18);
                 table.addCell(cell);
-            for (LoanVO loanVO : loanVOList) {
-                table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(loanVO.getContractNo())?"":loanVO.getContractNo()), font))).setMinimumHeight(18);
-                table.addCell(new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(loanVO.getLoanNo())?"/":loanVO.getLoanNo()), font))).setMinimumHeight(18);
             }
             log.info("generatePDF 开始生成pdf end",LOG_PRE,table.getBody());
             document.add(table);