diff --git a/src/main/java/com/yxt/yythmall/adminapi/ordertools/OrdertoolsService.java b/src/main/java/com/yxt/yythmall/adminapi/ordertools/OrdertoolsService.java index 910d9d0..2cf0867 100644 --- a/src/main/java/com/yxt/yythmall/adminapi/ordertools/OrdertoolsService.java +++ b/src/main/java/com/yxt/yythmall/adminapi/ordertools/OrdertoolsService.java @@ -31,12 +31,13 @@ public class OrdertoolsService { ResultBean fub = fileUploadComponent.uploadFile(file, "zfdd"); String filePath = fub.getData().getFilePath(); String fp = fileUploadComponent.getUploadPath() + filePath; - String outFilePath = "/zfdd/fhd" + System.currentTimeMillis() + ".xlsx"; + String outFilePath = "zfdd/fhd" + System.currentTimeMillis() + ".xlsx"; String outFileName = fileUploadComponent.getUploadPath() + outFilePath; String outFileUrl = fileUploadComponent.getUrlPrefix() + outFilePath; List inList = new ArrayList<>(); ExcelReaderBuilder read = EasyExcel.read(fp, WxOrderIn.class, createReadListener(inList)); + read.sheet().doRead(); List toList = new ArrayList<>(); inList.forEach(inObj -> { @@ -47,12 +48,9 @@ public class OrdertoolsService { toObj.setGoodsNames(ordOrderService.orderGoodsNames(inObj.getMerchantOrderNo())); toList.add(toObj); }); + EasyExcel.write(outFileName, ToImportOrderExcel.class).sheet("发货单").doWrite(toList); -// ArrayList EasyExcel.write(response.getOutputStream(), ReserveCustomerExcel.class).sheet("预约单明细").doWrite(list); - - - read.sheet().doRead(); - return ""; + return outFileUrl; } private ReadListener createReadListener(List inList) {