孟苏慧

调整顺序

......@@ -343,6 +343,10 @@ public class SettlementServiceImpl implements SettlementService {
Row titleRow = sheet.createRow(rowNum++);
int columnNum = 0;
Cell cellPayTime = titleRow.createCell(columnNum++);
cellPayTime.setCellValue("支付时间");
cellPayTime.setCellStyle(headerStyle);
Cell cell0 = titleRow.createCell(columnNum++);
cell0.setCellValue("用餐时间");
cell0.setCellStyle(headerStyle);
......@@ -351,10 +355,6 @@ public class SettlementServiceImpl implements SettlementService {
cell1.setCellValue("订单号");
cell1.setCellStyle(headerStyle);
Cell cellPayTime = titleRow.createCell(columnNum++);
cellPayTime.setCellValue("支付时间");
cellPayTime.setCellStyle(headerStyle);
Cell cellOrderer = titleRow.createCell(columnNum++);
cellOrderer.setCellValue("下单人");
cellOrderer.setCellStyle(headerStyle);
......@@ -426,6 +426,10 @@ public class SettlementServiceImpl implements SettlementService {
Row dataRow = sheet.createRow(rowNum++);
columnNum = 0;
Cell dataCellPayTime = dataRow.createCell(columnNum++);
dataCellPayTime.setCellValue(orderDetail.getPayTime() != null ? orderDetail.getPayTime() : "");
dataCellPayTime.setCellStyle(dataStyle);
Cell dataCell0 = dataRow.createCell(columnNum++);
dataCell0.setCellValue(orderDetail.getMealTime() != null ? orderDetail.getMealTime() : "");
dataCell0.setCellStyle(dataStyle);
......@@ -434,10 +438,6 @@ public class SettlementServiceImpl implements SettlementService {
dataCell1.setCellValue(orderDetail.getCode() != null ? orderDetail.getCode() : "");
dataCell1.setCellStyle(dataStyle);
Cell dataCellPayTime = dataRow.createCell(columnNum++);
dataCellPayTime.setCellValue(orderDetail.getPayTime() != null ? orderDetail.getPayTime() : "");
dataCellPayTime.setCellStyle(dataStyle);
Cell dataCellOrderer = dataRow.createCell(columnNum++);
dataCellOrderer.setCellValue(orderDetail.getOrderer() != null ? orderDetail.getOrderer() : "");
dataCellOrderer.setCellStyle(dataStyle);
......