Selaa lähdekoodia

订单导出问题

zhangxin 4 päivää sitten
vanhempi
commit
60a1962bd1

+ 1 - 1
yami-shop-platform/src/main/java/com/yami/shop/platform/controller/ExportTaskController.java

@@ -68,7 +68,7 @@ public class ExportTaskController {
     @GetMapping("/download")
     @ApiOperation("下载文件")
     public void downloadFile(
-            @RequestParam  String fileId,
+            @RequestParam("fileId")  String fileId,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException {
         if (StringUtils.isEmpty(fileId)){

+ 1 - 1
yami-shop-service/src/main/java/com/yami/shop/service/impl/ExportTaskServiceImpl.java

@@ -134,7 +134,7 @@ public class ExportTaskServiceImpl extends ServiceImpl<ExportTaskMapper, ExportT
         ExportTask exportTask = baseMapper.findByUserIdAndId(fileId,userId);
 
         if (exportTask==null){
-            throw new GlobalException("导出任务不存在或不属于该用户id"+fileId);
+            throw new GlobalException("导出任务不存在或不属于该用户,文件id:"+fileId);
         }
         if (!(exportTask.getExportStatus()==1||exportTask.getExportStatus()==3)){
             throw new GlobalException("导出任务未生成不允许下载");

+ 3 - 3
yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderRefundServiceImpl.java

@@ -1362,7 +1362,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             try {
                 // 记录任务开始
                 log.info("开始执行导出任务,用户ID: {}", userId);
-                exportNormalOrders(orderRefundList,exportTask,"退款订单",context);
+                exportNormalOrders(orderRefundList,exportTask,"售后订单",context);
                 // 记录任务完成
                 log.info("导出任务完成,用户ID: {}", userId);
             } catch (Exception e) {
@@ -1399,7 +1399,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
         File file = new File(exportTask.getFileUrl());
         try (Workbook workbook = new SXSSFWorkbook(100)) {
             // 创建Sheet
-            Sheet sheet = workbook.createSheet("退款订单");
+            Sheet sheet = workbook.createSheet("售后订单");
 
             // 设置列宽
             setupColumnWidth(sheet);
@@ -1420,7 +1420,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                     "所属企业", "买家姓名", "买家电话"
             };
             // 创建合并单元格的表头
-            ExportUtils.createMergedHeader(sheet, headerStyle,"退款订单",19);
+            ExportUtils.createMergedHeader(sheet, headerStyle,"售后订单",19);
 
             // 创建列标题行
             ExportUtils.createColumnHeaders(sheet, headerStyle,headers);

+ 2 - 1
yami-shop-service/src/main/java/com/yami/shop/utils/ExportUtils.java

@@ -612,8 +612,9 @@ public class ExportUtils {
             case "docx":
                 return "application/msword";
             case "xls":
-            case "xlsx":
                 return "application/vnd.ms-excel";
+            case "xlsx":
+                return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
             case "ppt":
             case "pptx":
                 return "application/vnd.ms-powerpoint";