From 75d6a10fd6ab39dc2db63c8cf4879ebba17f4e54 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 九月 2023 09:19:20 +0800
Subject: [PATCH] 更新
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 245 +++++++++++++++++++++++++-----------------------
1 files changed, 127 insertions(+), 118 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index c244630..8f04b69 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -614,131 +614,140 @@
orderLogistics.setPayMoney(orderMoney);
if(ToolUtil.isNotEmpty(userInfo.getEmail())){
- String path = templatePath + "user/receiptLogistics.html";
- Document document = Jsoup.parse(new File(path), "UTF-8");
- SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
- Driver driver = driverService.selectById(orderLogistics.getDriverId());
- if(1 == language){
- document.getElementById("english").remove();
- document.getElementById("french").remove();
- Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(sdf2.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
- Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
- Element xj_chinese = document.getElementById("xj_chinese");
- xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
- Element pay_type_chinese = document.getElementById("pay_type_chinese");
- pay_type_chinese.text("现金");
- Element pay_money_chinese = document.getElementById("pay_money_chinese");
- pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
- Element pdf_chinese = document.getElementById("pdf_chinese");
- pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- Element lost_item_chinese = document.getElementById("lost_item_chinese");
- lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ String path = templatePath + "user/receiptLogistics.html";
+ Document document = Jsoup.parse(new File(path), "UTF-8");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+ Driver driver = driverService.selectById(orderLogistics.getDriverId());
+ if(1 == language){
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
+ Element title_chinese = document.getElementById("title_chinese");
+ title_chinese.text(sdf2.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
+ Element xcf_chinese = document.getElementById("xcf_chinese");
+ xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
+ Element xj_chinese = document.getElementById("xj_chinese");
+ xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
+ Element pay_type_chinese = document.getElementById("pay_type_chinese");
+ pay_type_chinese.text("现金");
+ Element pay_money_chinese = document.getElementById("pay_money_chinese");
+ pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
+ Element pdf_chinese = document.getElementById("pdf_chinese");
+ pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_chinese = document.getElementById("lost_item_chinese");
+ lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
// Element track_chinese = document.getElementById("track_chinese");
// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
- Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime()));
- Elements driver_chinese = document.getElementsByClass("driver_chinese");
- for (int i = 0; i < driver_chinese.size(); i++) {
- Element element = driver_chinese.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
- }
- Element start_address_chinese = document.getElementById("start_address_chinese");
- start_address_chinese.text(orderLogistics.getStartAddress());
- Element end_address_chinese = document.getElementById("end_address_chinese");
- end_address_chinese.text(orderLogistics.getEndAddress());
- }
- if(2 == language){
- document.getElementById("chinese").remove();
- document.getElementById("french").remove();
- Element title_english = document.getElementById("title_english");
- title_english.text(sdf2.format(orderLogistics.getTravelTime()) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
- Element xcf_english = document.getElementById("xcf_english");
- xcf_english.text("GHS " + orderLogistics.getOrderMoney());
- Element xj_english = document.getElementById("xj_english");
- xj_english.text("GHS " + orderLogistics.getOrderMoney());
- Element pay_type_english = document.getElementById("pay_type_english");
- pay_type_english.text("cash");
- Element pay_money_english = document.getElementById("pay_money_english");
- pay_money_english.text("GHS " + orderLogistics.getPayMoney());
- Element pdf_english = document.getElementById("pdf_english");
- pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- Element lost_item_english = document.getElementById("lost_item_english");
- lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
+ Element pay_time_chinese = document.getElementById("pay_time_chinese");
+ pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime()));
+ Elements driver_chinese = document.getElementsByClass("driver_chinese");
+ for (int i = 0; i < driver_chinese.size(); i++) {
+ Element element = driver_chinese.get(i);
+ element.text(driver.getFirstName() + "." + driver.getLastName());
+ }
+ Element start_address_chinese = document.getElementById("start_address_chinese");
+ start_address_chinese.text(orderLogistics.getStartAddress());
+ Element end_address_chinese = document.getElementById("end_address_chinese");
+ end_address_chinese.text(orderLogistics.getEndAddress());
+ }
+ if(2 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
+ Element title_english = document.getElementById("title_english");
+ title_english.text(sdf2.format(orderLogistics.getTravelTime()) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
+ Element xcf_english = document.getElementById("xcf_english");
+ xcf_english.text("GHS " + orderLogistics.getOrderMoney());
+ Element xj_english = document.getElementById("xj_english");
+ xj_english.text("GHS " + orderLogistics.getOrderMoney());
+ Element pay_type_english = document.getElementById("pay_type_english");
+ pay_type_english.text("cash");
+ Element pay_money_english = document.getElementById("pay_money_english");
+ pay_money_english.text("GHS " + orderLogistics.getPayMoney());
+ Element pdf_english = document.getElementById("pdf_english");
+ pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_english = document.getElementById("lost_item_english");
+ lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
// Element track_english = document.getElementById("track_english");
// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
- Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(sdf1.format(orderLogistics.getTravelTime()));
- Elements driver_english = document.getElementsByClass("driver_english");
- for (int i = 0; i < driver_english.size(); i++) {
- Element element = driver_english.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
- }
- Element start_address_english = document.getElementById("start_address_english");
- start_address_english.text(orderLogistics.getStartAddress());
- Element end_address_english = document.getElementById("end_address_english");
- end_address_english.text(orderLogistics.getEndAddress());
- }
- if(3 == language){
- document.getElementById("chinese").remove();
- document.getElementById("english").remove();
- Element title_french = document.getElementById("title_french");
- title_french.text(sdf2.format(orderLogistics.getTravelTime()) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
- Element xcf_french = document.getElementById("xcf_french");
- xcf_french.text("GHS " + orderLogistics.getOrderMoney());
- Element xj_french = document.getElementById("xj_french");
- xj_french.text("GHS " + orderLogistics.getOrderMoney());
- Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text("espèces");
- Element pay_money_french = document.getElementById("pay_money_french");
- pay_money_french.text("GHS " + orderLogistics.getPayMoney());
- Element pdf_french = document.getElementById("pdf_french");
- pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
- Element lost_item_french = document.getElementById("lost_item_french");
- lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
+ Element pay_time_english = document.getElementById("pay_time_english");
+ pay_time_english.text(sdf1.format(orderLogistics.getTravelTime()));
+ Elements driver_english = document.getElementsByClass("driver_english");
+ for (int i = 0; i < driver_english.size(); i++) {
+ Element element = driver_english.get(i);
+ element.text(driver.getFirstName() + "." + driver.getLastName());
+ }
+ Element start_address_english = document.getElementById("start_address_english");
+ start_address_english.text(orderLogistics.getStartAddress());
+ Element end_address_english = document.getElementById("end_address_english");
+ end_address_english.text(orderLogistics.getEndAddress());
+ }
+ if(3 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
+ Element title_french = document.getElementById("title_french");
+ title_french.text(sdf2.format(orderLogistics.getTravelTime()) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
+ Element xcf_french = document.getElementById("xcf_french");
+ xcf_french.text("GHS " + orderLogistics.getOrderMoney());
+ Element xj_french = document.getElementById("xj_french");
+ xj_french.text("GHS " + orderLogistics.getOrderMoney());
+ Element pay_type_french = document.getElementById("pay_type_french");
+ pay_type_french.text("espèces");
+ Element pay_money_french = document.getElementById("pay_money_french");
+ pay_money_french.text("GHS " + orderLogistics.getPayMoney());
+ Element pdf_french = document.getElementById("pdf_french");
+ pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
+ Element lost_item_french = document.getElementById("lost_item_french");
+ lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
// Element track_french = document.getElementById("track_french");
// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
- Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(sdf1.format(orderLogistics.getTravelTime()));
- Elements driver_french = document.getElementsByClass("driver_french");
- for (int i = 0; i < driver_french.size(); i++) {
- Element element = driver_french.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
+ Element pay_time_french = document.getElementById("pay_time_french");
+ pay_time_french.text(sdf1.format(orderLogistics.getTravelTime()));
+ Elements driver_french = document.getElementsByClass("driver_french");
+ for (int i = 0; i < driver_french.size(); i++) {
+ Element element = driver_french.get(i);
+ element.text(driver.getFirstName() + "." + driver.getLastName());
+ }
+ Element start_address_french = document.getElementById("start_address_french");
+ start_address_french.text(orderLogistics.getStartAddress());
+ Element end_address_french = document.getElementById("end_address_french");
+ end_address_french.text(orderLogistics.getEndAddress());
+ }
+
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis", document.html());
+
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+ FileInputStream fileInputStream = new FileInputStream(file);
+ File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ if(!file1.exists()){
+ file1.mkdirs();
+ }
+ file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
+ if(!file1.exists()){
+ file1.createNewFile();
+ }
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
}
- Element start_address_french = document.getElementById("start_address_french");
- start_address_french.text(orderLogistics.getStartAddress());
- Element end_address_french = document.getElementById("end_address_french");
- end_address_french.text(orderLogistics.getEndAddress());
- }
-
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis", document.html());
-
- //开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
- if(!file.exists()){
- file.mkdirs();
- }
- file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
- if(!file.exists()){
- file.createNewFile();
- }
- FileWriter fileWriter = new FileWriter(file);
- fileWriter.write(document.html());
- fileWriter.flush();
- fileWriter.close();
- FileInputStream fileInputStream = new FileInputStream(file);
- File file1 = new File("/usr/local/nginx/html/files/pdf/");
- if(!file1.exists()){
- file1.mkdirs();
- }
- file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
- if(!file1.exists()){
- file1.createNewFile();
- }
- FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+ }).start();
}
--
Gitblit v1.7.1