From b997fbe016ace57406e8938ebba3f8c176fbabf9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 10:34:30 +0800
Subject: [PATCH] 新增加国外短信
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 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 680ee35..8e24eca 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
@@ -29,6 +29,8 @@
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
+import org.jsoup.nodes.FormElement;
+import org.jsoup.select.Elements;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -564,6 +566,7 @@
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();
@@ -579,6 +582,11 @@
pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
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");
@@ -599,6 +607,11 @@
pay_money_english.text("GHS " + orderLogistics.getPayMoney());
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");
@@ -619,6 +632,11 @@
pay_money_french.text("GHS " + orderLogistics.getPayMoney());
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");
@@ -659,6 +677,7 @@
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();
@@ -674,6 +693,11 @@
pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
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");
@@ -694,6 +718,11 @@
pay_money_english.text("GHS " + orderLogistics.getPayMoney());
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");
@@ -714,6 +743,11 @@
pay_money_french.text("GHS " + orderLogistics.getPayMoney());
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");
@@ -953,6 +987,7 @@
Document document = Jsoup.parse(new File(path), "UTF-8");
SimpleDateFormat sdf = 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();
@@ -968,6 +1003,11 @@
pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
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");
@@ -988,6 +1028,11 @@
pay_money_english.text("GHS " + orderLogistics.getPayMoney());
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");
@@ -1008,13 +1053,18 @@
pay_money_french.text("GHS " + orderLogistics.getPayMoney());
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 ? "Delivery receipt for small parts in the city" : "Réception logistique de petites pièces dans la ville", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis", document.html());
}
--
Gitblit v1.7.1