From adf2ede692b76cf95d0cec80f4087e52d760b219 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 29 九月 2024 17:21:56 +0800
Subject: [PATCH] 修改bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 614f715..a4833db 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -203,10 +203,11 @@
redisUtil.setStrValue(phone, authCode, 5 * 60);//设置五分钟过期
switch (language){
case 1:
- sms = "您的验证码为：" + authCode + "，该验证码5分钟内有效，请勿泄漏于他人！";
+// sms = "您的验证码为：" + authCode + "，该验证码5分钟内有效，请勿泄漏于他人！";
+ sms = "Your verification code is " + authCode + ", it is valid within 5 minutes, please do not reveal it to others.";
break;
case 2:
- sms = "Your verification code is " + authCode + "，it is valid within 5 minutes, please do not reveal it to others.";
+ sms = "Your verification code is " + authCode + ", it is valid within 5 minutes, please do not reveal it to others.";
break;
case 3:
sms = "Votre code de validation est " + authCode + " et il est valide pendant 5 minutes. Veuillez ne pas le révéler à d’autres personnes.";
@@ -1986,7 +1987,7 @@
Element rewardToday_award = document1.getElementById("rewardToday_award");
rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
Element rewardToday_content = document1.getElementById("rewardToday_content");
- rewardToday_content.text("邀请司机注册即可获得奖励。<br/>注意此活动是有时间限制的，详情请查看I-GO平台。");
+ rewardToday_content.html("邀请司机注册即可获得奖励。<br/>注意此活动是有时间限制的，详情请查看I-GO平台。");
}
if (2 == language) {
document1.getElementById("chinese").remove();
@@ -2007,7 +2008,7 @@
Element rewardToday1_award = document1.getElementById("rewardToday1_award");
rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
Element rewardToday1_content = document1.getElementById("rewardToday1_content");
- rewardToday1_content.text("Invite drivers to register to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
+ rewardToday1_content.html("Invite drivers to register to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
}
if (3 == language) {
document1.getElementById("chinese").remove();
@@ -2028,7 +2029,7 @@
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
- rewardToday2_content.text("Invitez les chauffeurs à s’inscrire pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
+ rewardToday2_content.html("Invitez les chauffeurs à s’inscrire pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
}
EmailUtil.send(driver.getEmail(), language == 1 ? "邀请司机奖励（活动）" : language == 2 ? "Invite drivers and earn" : "Invitez des chauffeurs et gagnez de l’argent", document1.html());
String randomString = ToolUtil.getRandomString(10);
@@ -2109,7 +2110,7 @@
Element rewardToday_award = document1.getElementById("rewardToday_award");
rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
Element rewardToday_content = document1.getElementById("rewardToday_content");
- rewardToday_content.text("邀请用户注册即可获得奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
+ rewardToday_content.html("邀请用户注册即可获得奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
}
if (2 == language) {
document1.getElementById("chinese").remove();
@@ -2130,7 +2131,7 @@
Element rewardToday1_award = document1.getElementById("rewardToday1_award");
rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
Element rewardToday1_content = document1.getElementById("rewardToday1_content");
- rewardToday1_content.text("Invite users to register to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
+ rewardToday1_content.html("Invite users to register to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
}
if (3 == language) {
document1.getElementById("chinese").remove();
@@ -2151,7 +2152,7 @@
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
- rewardToday2_content.text("Invitez les utilisateurs à s’inscrire pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
+ rewardToday2_content.html("Invitez les utilisateurs à s’inscrire pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
}
EmailUtil.send(driver.getEmail(), language == 1 ? "邀请用户奖励(活动)" : language == 2 ? "Invite users and earn" : "Invitez des utilisateurs et gagnez de l’argent", document1.html());
String randomString = ToolUtil.getRandomString(10);
@@ -2233,7 +2234,7 @@
Element rewardToday_award = document1.getElementById("rewardToday_award");
rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
Element rewardToday_content = document1.getElementById("rewardToday_content");
- rewardToday_content.text("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
+ rewardToday_content.html("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
}
if (2 == language) {
document1.getElementById("chinese").remove();
@@ -2254,7 +2255,7 @@
Element rewardToday1_award = document1.getElementById("rewardToday1_award");
rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
Element rewardToday1_content = document1.getElementById("rewardToday1_content");
- rewardToday1_content.text("Stay online for " + driverActivityOnline.getOnline() + " hours to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
+ rewardToday1_content.html("Stay online for " + driverActivityOnline.getOnline() + " hours to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
}
if (3 == language) {
document1.getElementById("chinese").remove();
@@ -2275,7 +2276,7 @@
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
- rewardToday2_content.text("Restez en ligne pendant " + driverActivityOnline.getOnline() + " heures pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
+ rewardToday2_content.html("Restez en ligne pendant " + driverActivityOnline.getOnline() + " heures pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
}
EmailUtil.send(driver.getEmail(), language == 1 ? "在线时长奖励（活动）" : language == 2 ? "Online-duration reward activity" : "Activité de récompense en ligne", document1.html());
String randomString = ToolUtil.getRandomString(10);
@@ -2357,7 +2358,7 @@
Element rewardToday_award = document1.getElementById("rewardToday_award");
rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
Element rewardToday_content = document1.getElementById("rewardToday_content");
- rewardToday_content.text("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
+ rewardToday_content.html("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
}
if (2 == language) {
document1.getElementById("chinese").remove();
@@ -2378,7 +2379,7 @@
Element rewardToday1_award = document1.getElementById("rewardToday1_award");
rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
Element rewardToday1_content = document1.getElementById("rewardToday1_content");
- rewardToday1_content.text("Stay online and complete " + driverActivityOrder.getOrderNum() + " trips to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
+ rewardToday1_content.html("Stay online and complete " + driverActivityOrder.getOrderNum() + " trips to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
}
if (3 == language) {
document1.getElementById("chinese").remove();
@@ -2399,7 +2400,7 @@
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
- rewardToday2_content.text("Restez en ligne et effectuez " + driverActivityOrder.getOrderNum() + " trajets pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
+ rewardToday2_content.html("Restez en ligne et effectuez " + driverActivityOrder.getOrderNum() + " trajets pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
}
EmailUtil.send(driver.getEmail(), language == 1 ? "累计接单奖励（活动）" : language == 2 ? "Cumulative order activity" : "Activité cumulée des commandes", document1.html());
String randomString = ToolUtil.getRandomString(10);
@@ -2502,7 +2503,7 @@
Element reward_user = document1.getElementById("reward_user");
reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward_content = document1.getElementById("reward_content");
- reward_content.text("今日累计在线" + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收。<br/>详情请查看I-GO平台。");
+ reward_content.html("今日累计在线" + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收。<br/>详情请查看I-GO平台。");
}
if (2 == language) {
document1.getElementById("chinese").remove();
@@ -2521,7 +2522,7 @@
Element reward1_user = document1.getElementById("reward1_user");
reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward1_content = document1.getElementById("reward1_content");
- reward1_content.text("You stayed online for " + dao.getOnline() + " hours today, and got a bonus of GHS" + dah.getMoney() + ", please check.<br/>Check your app for more details.");
+ reward1_content.html("You stayed online for " + dao.getOnline() + " hours today, and got a bonus of GHS" + dah.getMoney() + ", please check.<br/>Check your app for more details.");
}
if (3 == language) {
document1.getElementById("chinese").remove();
@@ -2540,7 +2541,7 @@
Element reward2_user = document1.getElementById("reward2_user");
reward2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward2_content = document1.getElementById("reward2_content");
- reward2_content.text("Vous êtes resté en ligne pendant " + dao.getOnline() + " heures aujourd’hui et avez obtenu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails.");
+ reward2_content.html("Vous êtes resté en ligne pendant " + dao.getOnline() + " heures aujourd’hui et avez obtenu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails.");
}
EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
String randomString = ToolUtil.getRandomString(10);
@@ -2621,7 +2622,7 @@
Element reward_user = document1.getElementById("reward_user");
reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward_content = document1.getElementById("reward_content");
- reward_content.text("今日累计接单" + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收。<br/>详情请查看I-GO平台。");
+ reward_content.html("今日累计接单" + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收。<br/>详情请查看I-GO平台。");
}
if (2 == language) {
document1.getElementById("chinese").remove();
@@ -2640,7 +2641,7 @@
Element reward1_user = document1.getElementById("reward1_user");
reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward1_content = document1.getElementById("reward1_content");
- reward1_content.text("You completed " + dao.getOrderNum() + " trips today, and got a bonus of GHS" + dah.getMoney() + ", please check.<br/>Check your app for more details.");
+ reward1_content.html("You completed " + dao.getOrderNum() + " trips today, and got a bonus of GHS" + dah.getMoney() + ", please check.<br/>Check your app for more details.");
}
if (3 == language) {
document1.getElementById("chinese").remove();
@@ -2659,7 +2660,7 @@
Element reward2_user = document1.getElementById("reward2_user");
reward2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward2_content = document1.getElementById("reward2_content");
- reward2_content.text("Vous avez effectué " + dao.getOrderNum() + " trajets aujourd’hui et avez reçu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails.");
+ reward2_content.html("Vous avez effectué " + dao.getOrderNum() + " trajets aujourd’hui et avez reçu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails.");
}
EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
--
Gitblit v1.7.1