|
@@ -470,7 +470,7 @@ public class AdminSalesOrderController {
|
|
|
// 创建单元格,设置值
|
|
|
row.createCell(0).setCellValue(order.getSalesId());
|
|
|
row.createCell(1).setCellValue(order.getSalesSalesTime()==null?"":format2.format(order.getSalesSalesTime()));
|
|
|
- row.createCell(2).setCellValue(storeInfo.getStoreId());
|
|
|
+ row.createCell(2).setCellValue(storeInfo.getStoreEfast());
|
|
|
row.createCell(3).setCellValue(order.getSalesDealCode());
|
|
|
row.createCell(4).setCellValue(order.getSalesAddressName());
|
|
|
row.createCell(5).setCellValue(order.getSalesAddressName());
|
|
@@ -481,7 +481,7 @@ public class AdminSalesOrderController {
|
|
|
row.createCell(10).setCellValue(payType);
|
|
|
row.createCell(11).setCellValue(order.getSalesDealCode());
|
|
|
row.createCell(12).setCellValue(order.getSalesPayTime()==null?"":format.format(order.getSalesPayTime()));
|
|
|
- row.createCell(13).setCellValue("");
|
|
|
+ row.createCell(13).setCellValue("EMS");
|
|
|
row.createCell(14).setCellValue("");
|
|
|
row.createCell(15).setCellValue("");
|
|
|
row.createCell(16).setCellValue(order.getSalesAdminRemark() == null ? "":order.getSalesAdminRemark());
|