Commit aed89940 authored by 吴琼's avatar 吴琼

xiugai

parent b68ce569
...@@ -810,6 +810,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR ...@@ -810,6 +810,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
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.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(StringUtils.isEmpty(orderVO.getPayTypeName())?"/":orderVO.getPayTypeName()), font))).setMinimumHeight(18);
//有多个物流信息,重复展示物流信息,商品信息,收货信息,物流详情 //有多个物流信息,重复展示物流信息,商品信息,收货信息,物流详情
log.info("生成pdf 物流信息logisticsVOList"+logisticsVOList.size());
if(logisticsVOList.size() > 1){ if(logisticsVOList.size() > 1){
//展示多个 //展示多个
for(int j= 0;j<logisticsVOList.size();j++){ for(int j= 0;j<logisticsVOList.size();j++){
...@@ -898,19 +899,21 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR ...@@ -898,19 +899,21 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
table.addCell(new Phrase(ITextPDFUtil.getUTF8String("商品件数"), font)); table.addCell(new Phrase(ITextPDFUtil.getUTF8String("商品件数"), font));
//商品信息数据 //商品信息数据
for(SkuVO skuVO:skuVOList){ if(CollectionUtils.isNotEmpty(skuVOList)){
//商品名称取值 for(SkuVO skuVO:skuVOList){
cell = new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(skuVO.getSkuName())?"/":skuVO.getSkuName()), font)); //商品名称取值
cell.setColspan(3); cell = new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(skuVO.getSkuName())?"/":skuVO.getSkuName()), font));
cell.setMinimumHeight(18); cell.setColspan(3);
table.addCell(cell); cell.setMinimumHeight(18);
//商品属性取值 table.addCell(cell);
cell = new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(skuVO.getSkuAttr())?"/":skuVO.getSkuAttr()), font)); //商品属性取值
cell.setColspan(2); cell = new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(skuVO.getSkuAttr())?"/":skuVO.getSkuAttr()), font));
cell.setMinimumHeight(18); cell.setColspan(2);
table.addCell(cell); cell.setMinimumHeight(18);
//商品件数取值 table.addCell(cell);
table.addCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(skuVO.getCount())?"/":skuVO.getCount()), font)); //商品件数取值
table.addCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(skuVO.getCount())?"/":skuVO.getCount()), font));
}
} }
//收货人信息 //收货人信息
...@@ -937,24 +940,26 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR ...@@ -937,24 +940,26 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
//物流详情 //物流详情
if(logisticsVOList.size()>0){ if(logisticsVOList.size()>0){
cell = new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String("物流详情"), font));
cell.setColspan(6);
cell.setMinimumHeight(18);
table.addCell(cell);
//物流详情标题
table.addCell(new Phrase(ITextPDFUtil.getUTF8String("时间"), font));
cell = new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String("状态"), font));
cell.setColspan(5);
cell.setMinimumHeight(18);
table.addCell(cell);
List<logisticsDetailVO> logisticsDetails =logisticsVOList.get(count).getDetailList(); List<logisticsDetailVO> logisticsDetails =logisticsVOList.get(count).getDetailList();
//物流详情数据 //物流详情数据
for(logisticsDetailVO vo : logisticsDetails){ if(CollectionUtils.isNotEmpty(logisticsDetails)){
table.addCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(vo.getTime())?"/":vo.getTime()), font)); cell = new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String("物流详情"), font));
cell = new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(vo.getDesc())?"/":vo.getDesc()), font)); cell.setColspan(6);
cell.setMinimumHeight(18);
table.addCell(cell);
//物流详情标题
table.addCell(new Phrase(ITextPDFUtil.getUTF8String("时间"), font));
cell = new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String("状态"), font));
cell.setColspan(5); cell.setColspan(5);
cell.setMinimumHeight(18); cell.setMinimumHeight(18);
table.addCell(cell); table.addCell(cell);
for(logisticsDetailVO vo : logisticsDetails){
table.addCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(vo.getTime())?"/":vo.getTime()), font));
cell = new PdfPCell(new Phrase(ITextPDFUtil.getUTF8String(StringUtils.isEmpty(vo.getDesc())?"/":vo.getDesc()), font));
cell.setColspan(5);
cell.setMinimumHeight(18);
table.addCell(cell);
}
} }
} }
return table; return table;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment