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/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 163 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 115 insertions(+), 48 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index d4fee16..547000e 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -37,6 +37,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.http.HttpEntity;
@@ -431,9 +433,9 @@
//添加消息
- systemNoticeService.addSystemNotice(1, language == 1 ? "您的专车订单已下单成功，我们正在为您指派司机，请稍后！" :
- language == 2 ? "Your private car order has been successfully placed, we are assigning a driver for you, please wait!" :
- "Votre commande de voiture exclusive a été passée avec succès. Nous vous assignons un chauffeur. Plus tard!", orderPrivateCar.getUserId(), 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您的打车订单已下单成功，我们正在为您指派司机，请稍后！" :
+ language == 2 ? "Your ride order has been successfully placed, we are assigning a driver for you, please wait!" :
+ "Votre commande a bien été passée, nous vous assignons un chauffeur, veuillez patienter!", orderPrivateCar.getUserId(), 1);
BaseWarpper baseWarpper = new BaseWarpper();
baseWarpper.setState(orderPrivateCar.getState());
@@ -1002,14 +1004,15 @@
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm");
Car car = carMapper.selectById(orderPrivateCar.getCarId());
+ Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
Double aDouble = 0D;
if(null != orderPrivateCar.getDriverId()){
aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
}
Double aDouble1 = Double.valueOf(orderPrivateCar.getMileage() / 1000);
if(1 == language){
- document.getElementById("english").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
Element title_chinese = document.getElementById("title_chinese");
title_chinese.text(sdf.format(orderPrivateCar.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
@@ -1022,6 +1025,11 @@
pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
Element pay_time_chinese = document.getElementById("pay_time_chinese");
pay_time_chinese.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ 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 cp_chinese = document.getElementById("cp_chinese");
cp_chinese.text("车牌：" + car.getCarLicensePlate());
Element pf_chinese = document.getElementById("pf_chinese");
@@ -1038,8 +1046,8 @@
end_address_chinese.text(orderPrivateCar.getEndAddress());
}
if(2 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
Element title_english = document.getElementById("title_english");
title_english.text(sdf.format(orderPrivateCar.getTravelTime()) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
@@ -1052,6 +1060,11 @@
pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
Element pay_time_english = document.getElementById("pay_time_english");
pay_time_english.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ 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 cp_english = document.getElementById("cp_english");
cp_english.text("Number Plate：" + car.getCarLicensePlate());
Element pf_english = document.getElementById("pf_english");
@@ -1068,8 +1081,8 @@
end_address_english.text(orderPrivateCar.getEndAddress());
}
if(3 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
Element title_french = document.getElementById("title_french");
title_french.text("Vous consommez GHS " + orderPrivateCar.getPayMoney() + " sur votre commande i-go1 le " + sdf.format(orderPrivateCar.getTravelTime()));
Element xcf_french = document.getElementById("xcf_french");
@@ -1082,6 +1095,11 @@
pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
Element pay_time_french = document.getElementById("pay_time_french");
pay_time_french.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ 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 cp_french = document.getElementById("cp_french");
cp_french.text("Plaque d’immatriculation：" + car.getCarLicensePlate());
Element pf_french = document.getElementById("pf_french");
@@ -1098,7 +1116,7 @@
end_address_french.text(orderPrivateCar.getEndAddress());
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "专车收据" : language == 2 ? "Private car receipt" : "Reçu de voiture privée", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride", document.html());
}
@@ -1179,9 +1197,10 @@
aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
}
Double aDouble1 = Double.valueOf(orderPrivateCar.getMileage() / 1000);
+ Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
if(1 == language){
- document.getElementById("english").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
Element title_chinese = document.getElementById("title_chinese");
title_chinese.text(sdf.format(orderPrivateCar.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
@@ -1194,6 +1213,11 @@
pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
Element pay_time_chinese = document.getElementById("pay_time_chinese");
pay_time_chinese.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ 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 cp_chinese = document.getElementById("cp_chinese");
cp_chinese.text("车牌：" + car.getCarLicensePlate());
Element pf_chinese = document.getElementById("pf_chinese");
@@ -1210,8 +1234,8 @@
end_address_chinese.text(orderPrivateCar.getEndAddress());
}
if(2 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
Element title_english = document.getElementById("title_english");
title_english.text(sdf.format(orderPrivateCar.getTravelTime()) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
@@ -1224,6 +1248,11 @@
pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
Element pay_time_english = document.getElementById("pay_time_english");
pay_time_english.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ 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 cp_english = document.getElementById("cp_english");
cp_english.text("Number Plate：" + car.getCarLicensePlate());
Element pf_english = document.getElementById("pf_english");
@@ -1240,8 +1269,8 @@
end_address_english.text(orderPrivateCar.getEndAddress());
}
if(3 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
Element title_french = document.getElementById("title_french");
title_french.text("Vous consommez GHS " + orderPrivateCar.getPayMoney() + " sur votre commande i-go1 le " + sdf.format(orderPrivateCar.getTravelTime()));
Element xcf_french = document.getElementById("xcf_french");
@@ -1254,6 +1283,11 @@
pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
Element pay_time_french = document.getElementById("pay_time_french");
pay_time_french.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ 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 cp_french = document.getElementById("cp_french");
cp_french.text("Plaque d’immatriculation：" + car.getCarLicensePlate());
Element pf_french = document.getElementById("pf_french");
@@ -1270,7 +1304,7 @@
end_address_french.text(orderPrivateCar.getEndAddress());
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "专车收据" : language == 2 ? "Private car receipt" : "Reçu de voiture privée", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride", document.html());
}
@@ -1375,24 +1409,24 @@
Document document = Jsoup.parse(new File(path), "UTF-8");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if(1 == language){
- document.getElementById("english").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
Element user_chinese = document.getElementById("user_chinese");
user_chinese.text("您好 " + userInfo.getNickName() + "，");
Element time_chinese = document.getElementById("time_chinese");
time_chinese.text("此活动有效期在" + sdf.format(query.getInsertTime()) + "至" + sdf.format(query.getEndTime()) + "，详情请查看I-GO平台");
}
if(2 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
Element user_english = document.getElementById("user_english");
user_english.text("Hello " + userInfo.getNickName() + "，");
Element time_english = document.getElementById("time_english");
time_english.text("You could use it from" + sdf.format(query.getInsertTime()) + "to" + sdf.format(query.getEndTime()) + "，check more details on the app.");
}
if(3 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
Element user_french = document.getElementById("user_french");
user_french.text("Bonjour " + userInfo.getNickName() + "，");
Element time_french = document.getElementById("time_french");
@@ -1538,14 +1572,15 @@
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm");
Car car = carMapper.selectById(orderPrivateCar.getCarId());
+ Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
Double aDouble = 0D;
if(null != orderPrivateCar.getDriverId()){
aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
}
Double aDouble1 = Double.valueOf(orderPrivateCar.getMileage() / 1000);
if(1 == language){
- document.getElementById("english").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
Element title_chinese = document.getElementById("title_chinese");
title_chinese.text(sdf.format(orderPrivateCar.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
@@ -1558,6 +1593,11 @@
pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
Element pay_time_chinese = document.getElementById("pay_time_chinese");
pay_time_chinese.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ 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 cp_chinese = document.getElementById("cp_chinese");
cp_chinese.text("车牌：" + car.getCarLicensePlate());
Element pf_chinese = document.getElementById("pf_chinese");
@@ -1574,8 +1614,8 @@
end_address_chinese.text(orderPrivateCar.getEndAddress());
}
if(2 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
Element title_english = document.getElementById("title_english");
title_english.text(sdf.format(orderPrivateCar.getTravelTime()) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
@@ -1588,6 +1628,11 @@
pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
Element pay_time_english = document.getElementById("pay_time_english");
pay_time_english.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ 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 cp_english = document.getElementById("cp_english");
cp_english.text("Number Plate：" + car.getCarLicensePlate());
Element pf_english = document.getElementById("pf_english");
@@ -1604,8 +1649,8 @@
end_address_english.text(orderPrivateCar.getEndAddress());
}
if(3 == language){
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
Element title_french = document.getElementById("title_french");
title_french.text("Vous consommez GHS " + orderPrivateCar.getPayMoney() + " sur votre commande i-go1 le " + sdf.format(orderPrivateCar.getTravelTime()));
Element xcf_french = document.getElementById("xcf_french");
@@ -1618,6 +1663,11 @@
pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
Element pay_time_french = document.getElementById("pay_time_french");
pay_time_french.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ 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 cp_french = document.getElementById("cp_french");
cp_french.text("Plaque d’immatriculation：" + car.getCarLicensePlate());
Element pf_french = document.getElementById("pf_french");
@@ -1634,7 +1684,7 @@
end_address_french.text(orderPrivateCar.getEndAddress());
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "专车收据" : language == 2 ? "Private car receipt" : "Reçu de voiture privée", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride", document.html());
}
@@ -1736,30 +1786,47 @@
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
//计算预计距离和剩余时间
String value = redisUtil.getValue("DRIVER" + String.valueOf(orderPrivateCar.getDriverId()));
+ String d = "0";
+ String t = "0";
if(null == value || "".equals(value)){
System.err.println("司机没有上传位置信息");
//调用获取轨迹中的数据
- List<Map<String, Object>> list = orderPositionService.queryTrack(orderId, 2);
- if(list.size() > 0){
- Map<String, Object> map = list.get(list.size() - 1);
- value = map.get("lon") + "," + map.get("lat");
+ File file = new File(filePath + orderId + "_1.txt");
+ if(file.exists()){
+ //读取文件(字符流)
+ BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
+ //循环取出数据
+ String str = null;
+ StringBuffer sb = new StringBuffer();
+ while ((str = in.readLine()) != null) {
+ sb.append(str);
+ }
+ List<OrderPosition> list = JSONArray.parseArray(sb.toString(), OrderPosition.class);
+ if(list.size() > 0){
+ OrderPosition orderPosition = list.get(list.size() - 1);
+ value = orderPosition.getLon() + "," + orderPosition.getLat();
+ }
}
+ }
+ String lnt = "0";
+ String lat = "0";
+ if(ToolUtil.isNotEmpty(value)){
+ lnt = value.split(",")[0];
+ lat = value.split(",")[1];
+ DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(lat), Double.valueOf(lnt));
+
+ if(null == distancematrix){
+ System.err.println("查询距离出错了");
+ }else if(distancematrix.getDistance() == 0){
+ System.err.println("未获取到有效的距离");
+ }else{
+ d = new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
+ t = new BigDecimal(distancematrix.getDuration()).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
+ }
}
- String lnt = (null != value ? value.split(",")[0] : "0.0");
- String lat = (null != value ? value.split(",")[1] : "0.0");
- DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(lat), Double.valueOf(lnt));
- String d = "0";
- String t = "0";
- if(null == distancematrix){
- System.err.println("查询距离出错了");
- }else if(distancematrix.getDistance() == 0){
- System.err.println("未获取到有效的距离");
- }else{
- d = new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
- t = new BigDecimal(distancematrix.getDuration()).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
- }
+
OrderServerWarpper orderServerWarpper = new OrderServerWarpper();
orderServerWarpper.setOrderId(orderPrivateCar.getId());
orderServerWarpper.setOrderType(1);
@@ -1776,7 +1843,7 @@
orderServerWarpper.setLaveTime("0");
}
if(orderPrivateCar.getState() == 5 || orderPrivateCar.getState() == 6){//服务中
- distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(lat), Double.valueOf(lnt), orderPrivateCar.getEndLat(), orderPrivateCar.getEndLon());
+ DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(lat), Double.valueOf(lnt), orderPrivateCar.getEndLat(), orderPrivateCar.getEndLon());
if(null == distancematrix){
System.err.println("查询距离出错了");
}else if(distancematrix.getDistance() == 0){
--
Gitblit v1.7.1