From 71a68f675e319967c3078f3f2b86ee971b47b50b Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 02 九月 2024 13:34:26 +0800
Subject: [PATCH] 修改bug和翻译
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 172 ++++++++++++++++++++++++++++----------------------------
1 files changed, 86 insertions(+), 86 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 ecf7c91..495ce14 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
@@ -598,7 +598,7 @@
public void run() {
Process process = null;
try {
- process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
+ process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -819,7 +819,7 @@
public void run() {
Process process = null;
try {
- process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
+ process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -936,7 +936,7 @@
public void run() {
Process process = null;
try {
- process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
+ process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -1133,8 +1133,8 @@
checkoutRequest.setRequestDescription("Travel completion payment");
checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
checkoutRequest.setPendingRedirectUrl("");
- checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
- checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
+ checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
+ checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, null, null, orderId, 4, 1,
@@ -1160,8 +1160,8 @@
checkoutRequest.setRequestDescription("Travel completion payment");
checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
checkoutRequest.setPendingRedirectUrl("");
- checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
- checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
+ checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
+ checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()==200){
@@ -1284,7 +1284,7 @@
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
- document.getElementsByTag("title").get(0).text("I-GO电子收据");
+ document.getElementsByTag("title").get(0).text("包裹收据");
Element title_chinese = document.getElementById("title_chinese");
title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
Element qbj_chinese = document.getElementById("qbj_chinese");
@@ -1365,11 +1365,11 @@
dispute_chinese.remove();
}
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");
+ pdf_chinese.attr("href", "https://igo.i-go.group/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");
+ lost_item_chinese.attr("href", "https://igo.i-go.group/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");
+// track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
Element pay_time_chinese = document.getElementById("pay_time_chinese");
pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_chinese = document.getElementsByClass("driver_chinese");
@@ -1392,7 +1392,7 @@
if(2 == language){
document.getElementById("chinese").remove();
document.getElementById("french").remove();
- document.getElementsByTag("title").get(0).text("Receipt");
+ document.getElementsByTag("title").get(0).text("Delivery receipt");
Element title_english = document.getElementById("title_english");
title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element qbj_english = document.getElementById("qbj_english");
@@ -1473,11 +1473,11 @@
dispute_english.remove();
}
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");
+ pdf_english.attr("href", "https://igo.i-go.group/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");
+ lost_item_english.attr("href", "https://igo.i-go.group/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");
+// track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
Element pay_time_english = document.getElementById("pay_time_english");
pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_english = document.getElementsByClass("driver_english");
@@ -1500,7 +1500,7 @@
if(3 == language){
document.getElementById("chinese").remove();
document.getElementById("english").remove();
- document.getElementsByTag("title").get(0).text("Reçu");
+ document.getElementsByTag("title").get(0).text("Reçu de livraison");
Element title_french = document.getElementById("title_french");
title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO ");
Element qbj_french = document.getElementById("qbj_french");
@@ -1581,11 +1581,11 @@
dispute_french.remove();
}
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");
+ pdf_french.attr("href", "https://igo.i-go.group/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");
+ lost_item_french.attr("href", "https://igo.i-go.group/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");
+// track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
Element pay_time_french = document.getElementById("pay_time_french");
pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_french = document.getElementsByClass("driver_french");
@@ -1606,14 +1606,14 @@
server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", document.html());
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -1622,28 +1622,28 @@
fileWriter.flush();
fileWriter.close();
- File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
if(!file1.exists()){
file1.mkdirs();
}
- file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
+ file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
if(!file1.exists()){
file1.createNewFile();
}
try{
FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
+ HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
}catch (Exception e){
e.printStackTrace();
System.out.println("html转pdf异常");
}
- String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html";
+ String link ="https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(userInfo.getId());
tEmail.setType(1);
- tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
+ tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison");
tEmail.setOrderId(orderId);
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
@@ -1820,7 +1820,7 @@
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
- document.getElementsByTag("title").get(0).text("I-GO电子收据");
+ document.getElementsByTag("title").get(0).text("包裹收据");
Element title_chinese = document.getElementById("title_chinese");
title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
Element qbj_chinese = document.getElementById("qbj_chinese");
@@ -1901,11 +1901,11 @@
dispute_chinese.remove();
}
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");
+ pdf_chinese.attr("href", "https://igo.i-go.group/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");
+ lost_item_chinese.attr("href", "https://igo.i-go.group/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");
+// track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
Element pay_time_chinese = document.getElementById("pay_time_chinese");
pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_chinese = document.getElementsByClass("driver_chinese");
@@ -1928,7 +1928,7 @@
if(2 == language){
document.getElementById("chinese").remove();
document.getElementById("french").remove();
- document.getElementsByTag("title").get(0).text("Receipt");
+ document.getElementsByTag("title").get(0).text("Delivery receipt");
Element title_english = document.getElementById("title_english");
title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element qbj_english = document.getElementById("qbj_english");
@@ -2009,11 +2009,11 @@
dispute_english.remove();
}
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");
+ pdf_english.attr("href", "https://igo.i-go.group/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");
+ lost_item_english.attr("href", "https://igo.i-go.group/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");
+// track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
Element pay_time_english = document.getElementById("pay_time_english");
pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_english = document.getElementsByClass("driver_english");
@@ -2036,7 +2036,7 @@
if(3 == language){
document.getElementById("chinese").remove();
document.getElementById("english").remove();
- document.getElementsByTag("title").get(0).text("Reçu");
+ document.getElementsByTag("title").get(0).text("Reçu de livraison");
Element title_french = document.getElementById("title_french");
title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO ");
Element qbj_french = document.getElementById("qbj_french");
@@ -2117,11 +2117,11 @@
dispute_french.remove();
}
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");
+ pdf_french.attr("href", "https://igo.i-go.group/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");
+ lost_item_french.attr("href", "https://igo.i-go.group/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");
+// track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
Element pay_time_french = document.getElementById("pay_time_french");
pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_french = document.getElementsByClass("driver_french");
@@ -2142,14 +2142,14 @@
server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", document.html());
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -2158,28 +2158,28 @@
fileWriter.flush();
fileWriter.close();
- File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
if(!file1.exists()){
file1.mkdirs();
}
- file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
+ file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
if(!file1.exists()){
file1.createNewFile();
}
try{
FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
+ HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
}catch (Exception e){
e.printStackTrace();
System.out.println("html转pdf异常");
}
- String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html";
+ String link ="https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(userInfo.getId());
tEmail.setType(1);
- tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
+ tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison");
tEmail.setOrderId(orderId);
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
@@ -2232,8 +2232,8 @@
checkoutRequest.setRequestDescription("Travel completion payment");
checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderLogisticsSpread");
checkoutRequest.setPendingRedirectUrl("");
- checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
- checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
+ checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
+ checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
return TinggPayUtil.checkoutRequest(checkoutRequest);
}
if(payType == 2){//银行卡支付
@@ -2251,8 +2251,8 @@
checkoutRequest.setRequestDescription("Travel completion payment");
checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderLogisticsSpread");
checkoutRequest.setPendingRedirectUrl("");
- checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
- checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
+ checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
+ checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
return TinggPayUtil.checkoutRequest(checkoutRequest);
}
@@ -2455,7 +2455,7 @@
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
- document.getElementsByTag("title").get(0).text("I-GO电子收据");
+ document.getElementsByTag("title").get(0).text("包裹收据");
Element title_chinese = document.getElementById("title_chinese");
title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
Element qbj_chinese = document.getElementById("qbj_chinese");
@@ -2536,11 +2536,11 @@
dispute_chinese.remove();
}
Element pdf_chinese = document.getElementById("pdf_chinese");
- pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
+ pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&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=" + id + "&orderType=4");
+ lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
// Element track_chinese = document.getElementById("track_chinese");
-// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
+// track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
Element pay_time_chinese = document.getElementById("pay_time_chinese");
pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_chinese = document.getElementsByClass("driver_chinese");
@@ -2563,7 +2563,7 @@
if(2 == language){
document.getElementById("chinese").remove();
document.getElementById("french").remove();
- document.getElementsByTag("title").get(0).text("Receipt");
+ document.getElementsByTag("title").get(0).text("Delivery receipt");
Element title_english = document.getElementById("title_english");
title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element qbj_english = document.getElementById("qbj_english");
@@ -2644,11 +2644,11 @@
dispute_english.remove();
}
Element pdf_english = document.getElementById("pdf_english");
- pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
+ pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&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=" + id + "&orderType=4");
+ lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
// Element track_english = document.getElementById("track_english");
-// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
+// track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
Element pay_time_english = document.getElementById("pay_time_english");
pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_english = document.getElementsByClass("driver_english");
@@ -2671,7 +2671,7 @@
if(3 == language){
document.getElementById("chinese").remove();
document.getElementById("english").remove();
- document.getElementsByTag("title").get(0).text("Reçu");
+ document.getElementsByTag("title").get(0).text("Reçu de livraison");
Element title_french = document.getElementById("title_french");
title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO ");
Element qbj_french = document.getElementById("qbj_french");
@@ -2752,11 +2752,11 @@
dispute_french.remove();
}
Element pdf_french = document.getElementById("pdf_french");
- pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
+ pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&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=" + id + "&orderType=4");
+ lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
// Element track_french = document.getElementById("track_french");
-// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
+// track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
Element pay_time_french = document.getElementById("pay_time_french");
pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_french = document.getElementsByClass("driver_french");
@@ -2777,14 +2777,14 @@
server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", document.html());
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + id + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + id + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -2793,28 +2793,28 @@
fileWriter.flush();
fileWriter.close();
- File file1 = new File("/usr/local/nginx/html/files/pdf/");
+ File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
if(!file1.exists()){
file1.mkdirs();
}
- file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + id + ".pdf");
+ file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + id + ".pdf");
if(!file1.exists()){
file1.createNewFile();
}
try{
FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + id + ".html", "I-GO", fileOutputStream);
+ HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + id + ".html", "I-GO", fileOutputStream);
}catch (Exception e){
e.printStackTrace();
System.out.println("html转pdf异常");
}
- String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + id + ".html";
+ String link ="https://igo.i-go.group/files/html/parcel_receipt_" + id + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(userInfo.getId());
tEmail.setType(1);
- tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
+ tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison");
tEmail.setOrderId(id);
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
@@ -2946,7 +2946,7 @@
Integer orderId = Integer.valueOf(String.valueOf(map.get("orderId")));
Integer state = Integer.valueOf(String.valueOf(map.get("state")));
if(state == 6){
- map.put("receipt", "http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html");
+ map.put("receipt", "https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html");
}else{
map.put("receipt", "");
}
@@ -3093,13 +3093,13 @@
String audioUrl = "";
switch (language1){
case 1:
- audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-CN.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-CN.mp3";
break;
case 2:
- audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-EN.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-EN.mp3";
break;
case 3:
- audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-FR.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-FR.mp3";
break;
}
pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), 4, orderLogistics.getState(), 0, "");
@@ -3237,7 +3237,7 @@
map.put("device", ToolUtil.isNotEmpty(driverId) ? 2 : 1);
map.put("orderType", orderLogistics.getType());
if(state == 8 || state == 9){
- map.put("receipt", "http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html");
+ map.put("receipt", "https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html");
}else{
map.put("receipt", "");
}
@@ -3408,8 +3408,8 @@
checkoutRequest.setRequestDescription("Cancel a trip");
checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
checkoutRequest.setPendingRedirectUrl("");
- checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
- checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
+ checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
+ checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, null, null, id, 4, 1, amount, null, 1);//添加预支付数据
@@ -3433,8 +3433,8 @@
checkoutRequest.setRequestDescription("Cancel a trip");
checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
checkoutRequest.setPendingRedirectUrl("");
- checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
- checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
+ checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
+ checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, null, null, id, 4, 2, amount, null, 1);//添加预支付数据
@@ -3612,13 +3612,13 @@
String audioUrl = "";
switch (language1){
case 1:
- audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-CN.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-CN.mp3";
break;
case 2:
- audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-EN.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-EN.mp3";
break;
case 3:
- audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-FR.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-FR.mp3";
break;
}
pushUtil.pushModifyAddress(2, orderLogistics.getDriverId(), orderId, 4, 1, audioUrl);
@@ -3738,11 +3738,11 @@
EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus", document.html());
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/redpacket_" + orderId + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/redpacket_" + orderId + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -3751,7 +3751,7 @@
fileWriter.flush();
fileWriter.close();
- String link ="http://182.160.16.251:81/files/html/redpacket_" + orderId + ".html";
+ String link ="https://igo.i-go.group/files/html/redpacket_" + orderId + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(userInfo.getId());
--
Gitblit v1.7.1