jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
孟苏慧
20cf1184 1 parent da435fc1

调整顺序

Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
...@@ -343,6 +343,10 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -343,6 +343,10 @@ public class SettlementServiceImpl implements SettlementService {
343 Row titleRow = sheet.createRow(rowNum++); 343 Row titleRow = sheet.createRow(rowNum++);
344 int columnNum = 0; 344 int columnNum = 0;
345 345
346 + Cell cellPayTime = titleRow.createCell(columnNum++);
347 + cellPayTime.setCellValue("支付时间");
348 + cellPayTime.setCellStyle(headerStyle);
349 +
346 Cell cell0 = titleRow.createCell(columnNum++); 350 Cell cell0 = titleRow.createCell(columnNum++);
347 cell0.setCellValue("用餐时间"); 351 cell0.setCellValue("用餐时间");
348 cell0.setCellStyle(headerStyle); 352 cell0.setCellStyle(headerStyle);
...@@ -351,10 +355,6 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -351,10 +355,6 @@ public class SettlementServiceImpl implements SettlementService {
351 cell1.setCellValue("订单号"); 355 cell1.setCellValue("订单号");
352 cell1.setCellStyle(headerStyle); 356 cell1.setCellStyle(headerStyle);
353 357
354 - Cell cellPayTime = titleRow.createCell(columnNum++);
355 - cellPayTime.setCellValue("支付时间");
356 - cellPayTime.setCellStyle(headerStyle);
357 -
358 Cell cellOrderer = titleRow.createCell(columnNum++); 358 Cell cellOrderer = titleRow.createCell(columnNum++);
359 cellOrderer.setCellValue("下单人"); 359 cellOrderer.setCellValue("下单人");
360 cellOrderer.setCellStyle(headerStyle); 360 cellOrderer.setCellStyle(headerStyle);
...@@ -426,6 +426,10 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -426,6 +426,10 @@ public class SettlementServiceImpl implements SettlementService {
426 Row dataRow = sheet.createRow(rowNum++); 426 Row dataRow = sheet.createRow(rowNum++);
427 columnNum = 0; 427 columnNum = 0;
428 428
429 + Cell dataCellPayTime = dataRow.createCell(columnNum++);
430 + dataCellPayTime.setCellValue(orderDetail.getPayTime() != null ? orderDetail.getPayTime() : "");
431 + dataCellPayTime.setCellStyle(dataStyle);
432 +
429 Cell dataCell0 = dataRow.createCell(columnNum++); 433 Cell dataCell0 = dataRow.createCell(columnNum++);
430 dataCell0.setCellValue(orderDetail.getMealTime() != null ? orderDetail.getMealTime() : ""); 434 dataCell0.setCellValue(orderDetail.getMealTime() != null ? orderDetail.getMealTime() : "");
431 dataCell0.setCellStyle(dataStyle); 435 dataCell0.setCellStyle(dataStyle);
...@@ -434,10 +438,6 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -434,10 +438,6 @@ public class SettlementServiceImpl implements SettlementService {
434 dataCell1.setCellValue(orderDetail.getCode() != null ? orderDetail.getCode() : ""); 438 dataCell1.setCellValue(orderDetail.getCode() != null ? orderDetail.getCode() : "");
435 dataCell1.setCellStyle(dataStyle); 439 dataCell1.setCellStyle(dataStyle);
436 440
437 - Cell dataCellPayTime = dataRow.createCell(columnNum++);
438 - dataCellPayTime.setCellValue(orderDetail.getPayTime() != null ? orderDetail.getPayTime() : "");
439 - dataCellPayTime.setCellStyle(dataStyle);
440 -
441 Cell dataCellOrderer = dataRow.createCell(columnNum++); 441 Cell dataCellOrderer = dataRow.createCell(columnNum++);
442 dataCellOrderer.setCellValue(orderDetail.getOrderer() != null ? orderDetail.getOrderer() : ""); 442 dataCellOrderer.setCellValue(orderDetail.getOrderer() != null ? orderDetail.getOrderer() : "");
443 dataCellOrderer.setCellStyle(dataStyle); 443 dataCellOrderer.setCellStyle(dataStyle);
......