From 853307d05e56ea3830d7e19824f7634e2f5ecba9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 01 八月 2025 16:31:24 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 75bd9e1..494fe50 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -54,6 +54,8 @@
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.*;
/**
@@ -2382,12 +2384,15 @@
List<TripOrderVo> tripOrderVos = processTripOrderVos(orderList);
String filePath = tripSheetGenerator.generatePdf(tripOrderVos);
File attachment = new File(filePath);
- emailUtil.sendEmailWithAttachment(tripSheet.getRecipientEmail(), "行程单", "请查收您的行程单", attachment);
+ String displayFileName = "贵人家园行程单.pdf";
+ emailUtil.sendEmailWithAttachment(tripSheet.getRecipientEmail(), "行程单", "请查收您的行程单", attachment,displayFileName);
attachment.delete(); // 发送成功后删除临时文件
- return ResultUtil.success("邮件发送成功");
+ Map<String, Object> result = new HashMap<>();
+ result.put("orderNum", orderList.size());
+ return ResultUtil.success(result);
} catch (Exception e) {
e.printStackTrace();
- return ResultUtil.error("邮件发送失败");
+ return ResultUtil.error("邮件发送失败"+e.getMessage());
}
}
/**
--
Gitblit v1.7.1