|
|
@@ -2048,7 +2048,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
"序号", "订单编号", "下单时间", "付款时间", "订单状态", "订单类型",
|
|
|
"商品名称", "海博商品ID", "商品编码", "规格", "单价(元)", "数量", "小计(元)",
|
|
|
"商品总数量", "商品总额(元)", "运费(元)", "积分抵扣(元)",
|
|
|
- "实付金额", "所属企业", "买家姓名", "买家电话"
|
|
|
+ "实付金额", "所属企业", "买家姓名", "买家电话","收货地址"
|
|
|
};
|
|
|
// 创建合并单元格的表头
|
|
|
ExportUtils.createMergedHeader(sheet, headerStyle, "正常订单",20);
|
|
|
@@ -2119,6 +2119,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
sheet.setColumnWidth(18, 15 * 256); // 所属企业
|
|
|
sheet.setColumnWidth(19, 10 * 256); // 买家姓名
|
|
|
sheet.setColumnWidth(20, 15 * 256); // 买家电话
|
|
|
+ sheet.setColumnWidth(21, 15 * 256); // 收货地址
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -2322,6 +2323,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
|
|
|
// 买家电话
|
|
|
ExportUtils.createCell(sheet, row, 20, 0, rowNum, order.getUserMobile(), dataStyle);
|
|
|
+ // 收货地址
|
|
|
+ ExportUtils.createCell(sheet, row, 21, 0, rowNum, order.getConsigneeAddress(), dataStyle);
|
|
|
}
|
|
|
|
|
|
/**
|
