From 7cfe226547265ef3944349bdde4e7b4e099c3f22 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 26 一月 2026 15:12:33 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 55964d9..d140154 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
@@ -53,11 +53,13 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.mail.MessagingException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.PrintWriter;
import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
import java.net.InetAddress;
import java.net.NetworkInterface;
@@ -65,6 +67,9 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
/**
* 订单控制器（综合）
@@ -2546,12 +2551,20 @@
// 根据订单类型和ID查询订单
orderList = queryOrdersByTypeAndIds(uid, tripSheet.getOrderType(), tripSheet.getOrderIdList());
}
- List<TripOrderVo> tripOrderVos = processTripOrderVos(orderList);
- String filePath = tripSheetGenerator.generatePdf(tripOrderVos);
- File attachment = new File(filePath);
- String displayFileName = "贵人家园出行-行程单.pdf";
- emailUtil.sendEmailWithAttachment(tripSheet.getRecipientEmail(), "贵人家园出行-行程单", "请查收您的行程单", attachment, displayFileName);
- attachment.delete(); // 发送成功后删除临时文件
+ ThreadPoolExecutor poolExecutor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
+ List<TripOrderVo> finalOrderList = orderList;
+ poolExecutor.execute(()->{
+ try {
+ List<TripOrderVo> tripOrderVos = processTripOrderVos(finalOrderList);
+ String filePath = tripSheetGenerator.generatePdf(tripOrderVos);
+ File attachment = new File(filePath);
+ String displayFileName = "贵人家园出行-行程单.pdf";
+ emailUtil.sendEmailWithAttachment(tripSheet.getRecipientEmail(), "贵人家园出行-行程单", "请查收您的行程单", attachment, displayFileName);
+ attachment.delete();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ });
Map<String, Object> result = new HashMap<>();
result.put("orderNum", orderList.size());
return ResultUtil.success(result);
--
Gitblit v1.7.1