From af6d43a41205f8c7fc1a965cb019c039063bf4f0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 13 十二月 2023 01:15:07 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 134 ++++++++++++++++++++++++++++----------------
1 files changed, 86 insertions(+), 48 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 7fd5109..014223d 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,13 +203,14 @@
sms = "您的验证码为：" + authCode + "，该验证码5分钟内有效，请勿泄漏于他人！";
break;
case 2:
- sms = "Your verification code is: " + authCode + ", the verification code is valid within 5 minutes, do not leak 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 vérification est: " + authCode + ". Ce code est valide pendant 5 minutes. Ne le divulguez pas aux autres!";
+ sms = "Votre code de validation est " + authCode + " et il est valide pendant 5 minutes. Veuillez ne pas le révéler à d’autres personnes.";
break;
}
smsUtil.sendCellulantMessage(phone, sms);
+ smsrecordService.saveData(type, phone, authCode, sms);
System.out.println(sms);
return ResultUtil.success();
}
@@ -242,10 +243,11 @@
document.getElementById("driverAudit").remove();
document.getElementById("carAudit").remove();
+ document.getElementsByTag("title").get(0).text("验证码");
Element email_user = document.getElementById("email_user");
email_user.text("您好 ，");
Element email_content = document.getElementById("email_content");
- email_content.text("邮件验证码是：" + authCode + "，请在5分钟内完成验证");
+ email_content.text("您正在绑定邮箱，本次请求的邮件验证码是：" + authCode + "，请在5分钟内完成验证");
}
if(2 == language){
document.getElementById("chinese").remove();
@@ -260,10 +262,11 @@
document.getElementById("driverAudit1").remove();
document.getElementById("carAudit1").remove();
+ document.getElementsByTag("title").get(0).text("Verification code");
Element email1_user = document.getElementById("email1_user");
email1_user.text("Hello ，");
Element email1_content = document.getElementById("email1_content");
- email1_content.text("verification code is " + authCode + ", please complete the verification within 5 minutes. If the request wasn't made by you, please ignore this email.");
+ email1_content.text("Your package pickup code is " + authCode + ", please complete the verification within 5 minutes");
}
if(3 == language){
document.getElementById("chinese").remove();
@@ -278,12 +281,13 @@
document.getElementById("driverAudit2").remove();
document.getElementById("carAudit2").remove();
+ document.getElementsByTag("title").get(0).text("Code de validation");
Element email2_user = document.getElementById("email2_user");
email2_user.text("Hello ，");
Element email2_content = document.getElementById("email2_content");
- email2_content.text("Vous êtes lié à une adresse e-mail. Le code de vérification e-mail pour cette demande est: " + authCode + ". Veuillez compléter la vérification dans les 5 minutes");
+ email2_content.text("Le code de ramassage de votre colis est " + authCode + ", veuillez effectuer la verification dans les 5minutes.");
}
- EmailUtil.send(email, language == 1 ? "验证码" : language == 2 ? "Verification code" : "Code de vérification", document.html());
+ EmailUtil.send(email, language == 1 ? "验证码" : language == 2 ? "Verification code" : "Code de validation", document.html());
return ResultUtil.success();
}
@@ -348,6 +352,7 @@
document.getElementById("driverAudit").remove();
document.getElementById("carAudit").remove();
+ document.getElementsByTag("title").get(0).text("邀请奖励");
Element invite_user = document.getElementById("invite_user");
invite_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element invite_content = document.getElementById("invite_content");
@@ -366,6 +371,7 @@
document.getElementById("driverAudit1").remove();
document.getElementById("carAudit1").remove();
+ document.getElementsByTag("title").get(0).text("Invite and earn");
Element invite1_user = document.getElementById("invite1_user");
invite1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element invite1_content = document.getElementById("invite1_content");
@@ -384,12 +390,13 @@
document.getElementById("driverAudit2").remove();
document.getElementById("carAudit2").remove();
+ document.getElementsByTag("title").get(0).text("Invitez et récompensez");
Element invite2_user = document.getElementById("invite2_user");
- invite2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ invite2_user.text("Bonjour " + driver.getFirstName() + " " + driver.getLastName() + "，");
Element invite2_content = document.getElementById("invite2_content");
invite2_content.text("Vous avez invité avec succès un conducteur à s’inscrire à i-go pour recevoir une récompense GHS " + bigDecimal.doubleValue() + ". Veuillez vérifier");
}
- EmailUtil.send(driver.getEmail(), language == 1 ? "邀请奖励" : language == 2 ? "invitation bonus" : "prime d'invitation", document.html());
+ EmailUtil.send(driver.getEmail(), language == 1 ? "邀请奖励" : language == 2 ? "Invite and earn" : "Invitez et récompensez", document.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -421,7 +428,7 @@
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
tEmail.setType(2);
- tEmail.setName(language == 1 ? "邀请奖励" : language == 2 ? "invitation bonus" : "prime d'invitation");
+ tEmail.setName(language == 1 ? "邀请奖励" : language == 2 ? "Invite and earn" : "Invitez et récompensez");
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
String week = EmailUtil.getWeek(language, i);
@@ -629,6 +636,7 @@
document1.getElementById("driverAudit").remove();
document1.getElementById("carAudit").remove();
+ document1.getElementsByTag("title").get(0).text("注册成功");
Element settle_user = document1.getElementById("settle_user");
settle_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
@@ -645,6 +653,7 @@
document1.getElementById("driverAudit1").remove();
document1.getElementById("carAudit1").remove();
+ document1.getElementsByTag("title").get(0).text("Registered successfully");
Element settle1_user = document1.getElementById("settle1_user");
settle1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
@@ -661,10 +670,11 @@
document1.getElementById("driverAudit2").remove();
document1.getElementById("carAudit2").remove();
+ document1.getElementsByTag("title").get(0).text("Enregistré avec succès");
Element settle2_user = document1.getElementById("settle2_user");
settle2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
- EmailUtil.send(driver.getEmail(), language == 1 ? "注册成功" : language == 2 ? "registration success" : "succès de l'inscription", document1.html());
+ EmailUtil.send(driver.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -696,7 +706,7 @@
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
tEmail.setType(2);
- tEmail.setName(language == 1 ? "注册成功" : language == 2 ? "registration success" : "succès de l'inscription");
+ tEmail.setName(language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès");
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
String week = EmailUtil.getWeek(language, i);
@@ -724,10 +734,10 @@
*/
@Override
public ResultUtil resetPassword(String phone, String code, String password, Integer language) throws Exception {
- boolean b = this.checkCaptcha("", phone, code);
- if(!b){
- return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
- }
+// boolean b = this.checkCaptcha("", phone, code);
+// if(!b){
+// return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
+// }
Driver driver = driverMapper.queryByPhone(phone);
if(null == driver){
return ResultUtil.error(language == 1 ? "电话号码未注册" : language == 2 ? "Mobile phone number was not registered." : "Le numéro de téléphone portable n’a pas été enregistré.");
@@ -751,6 +761,7 @@
document1.getElementById("driverAudit").remove();
document1.getElementById("carAudit").remove();
+ document1.getElementsByTag("title").get(0).text("重置密码");
Element pass_user = document1.getElementById("pass_user");
pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
@@ -767,6 +778,7 @@
document1.getElementById("driverAudit1").remove();
document1.getElementById("carAudit1").remove();
+ document1.getElementsByTag("title").get(0).text("Reset password");
Element pass1_user = document1.getElementById("pass1_user");
pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
@@ -783,10 +795,11 @@
document1.getElementById("driverAudit2").remove();
document1.getElementById("carAudit2").remove();
+ document1.getElementsByTag("title").get(0).text("Réinitialiser le mot de passe");
Element pass2_user = document1.getElementById("pass2_user");
pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
- EmailUtil.send(driver.getEmail(), language == 1 ? "重置密码" : language == 2 ? "reset Password" : "réinitialiser le mot de passe", document1.html());
+ EmailUtil.send(driver.getEmail(), language == 1 ? "重置密码" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -818,7 +831,7 @@
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
tEmail.setType(2);
- tEmail.setName(language == 1 ? "重置密码" : language == 2 ? "reset Password" : "réinitialiser le mot de passe");
+ tEmail.setName(language == 1 ? "重置密码" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe");
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
String week = EmailUtil.getWeek(language, i);
@@ -832,7 +845,6 @@
emailService.insert(tEmail);
}
- smsrecordService.saveData(6, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
return ResultUtil.success();
}
@@ -1221,8 +1233,6 @@
driver1.setPhoneOperator(phoneOperator);
driver1.setPhone(phone);
this.updateById(driver1);
-
- smsrecordService.saveData(7, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
return ResultUtil.success();
}
@@ -1273,6 +1283,7 @@
document1.getElementById("driverAudit").remove();
document1.getElementById("carAudit").remove();
+ document1.getElementsByTag("title").get(0).text("重置密码");
Element pass_user = document1.getElementById("pass_user");
pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
@@ -1289,6 +1300,7 @@
document1.getElementById("driverAudit1").remove();
document1.getElementById("carAudit1").remove();
+ document1.getElementsByTag("title").get(0).text("Reset password");
Element pass1_user = document1.getElementById("pass1_user");
pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
@@ -1305,10 +1317,11 @@
document1.getElementById("driverAudit2").remove();
document1.getElementById("carAudit2").remove();
+ document1.getElementsByTag("title").get(0).text("Réinitialiser le mot de passe");
Element pass2_user = document1.getElementById("pass2_user");
pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
- EmailUtil.send(driver.getEmail(), language == 1 ? "重置密码" : language == 2 ? "reset Password" : "réinitialiser le mot de passe", document1.html());
+ EmailUtil.send(driver.getEmail(), language == 1 ? "重置密码" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -1340,7 +1353,7 @@
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
tEmail.setType(2);
- tEmail.setName(language == 1 ? "重置密码" : language == 2 ? "reset Password" : "réinitialiser le mot de passe");
+ tEmail.setName(language == 1 ? "重置密码" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe");
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
String week = EmailUtil.getWeek(language, i);
@@ -1512,21 +1525,21 @@
DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityRegistered.getId());
activityWarpper.setContent(language == 1 ? "邀请司机注册奖励" + driverActivityRegistered.getMoney() + "元" :
- language == 2 ? "Invitation driver registration reward " + driverActivityRegistered.getMoney() + " yuan" :
- "Invitation pilote inscription récompense " + driverActivityRegistered.getMoney() + " yuan");
+ language == 2 ? " Invite drivers to register for a reward of GHS" + driverActivityRegistered.getMoney():
+ "Invitez les chauffeurs à s’inscrire pour une récompense de GHS" + driverActivityRegistered.getMoney());
break;
case 2://邀请用户注册
DriverActivityRegistered driverActivityRegistered1 = driverActivityRegisteredMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityRegistered1.getId());
activityWarpper.setContent(language == 1 ? "邀请用户注册奖励" + driverActivityRegistered1.getMoney() + "元" :
- language == 2 ? "Invite users to register and reward " + driverActivityRegistered1.getMoney() + " yuan" :
- "Bonus de " + driverActivityRegistered1.getMoney() + " $pour les utilisateurs invités à s’inscrire");
+ language == 2 ? "Invite users to register for a reward of GHS" + driverActivityRegistered1.getMoney():
+ "Invitez les utilisateurs à s’inscrire pour une récompense de GHS" + driverActivityRegistered1.getMoney());
break;
case 3://累计在线
DriverActivityOnline driverActivityOnline = driverActivityOnlineMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityOnline.getId());
StringBuffer sb = new StringBuffer(language == 1 ? "今日" :
- language == 2 ? " today " : " aujourd’hui ");
+ language == 2 ? "Today, stay online receiving orders of " : "Aujourd’hui, reste en ligne à recevoir des commandes ");
DriverOnline query = driverOnlineMapper.query(uid, sdf1.format(new Date()), 0);
Integer hour = 0;
if(null != query){
@@ -1534,7 +1547,7 @@
}
switch (driverActivityOnline.getType()){
case 1:
- sb.append(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
+ sb.append(language == 1 ? "打车" : language == 2 ? "ride" : "de course");
break;
case 2:
sb.append("出租车");
@@ -1543,12 +1556,12 @@
sb.append("城际出行");
continue;
case 4:
- sb.append(language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison");
+ sb.append(language == 1 ? "包裹" : language == 2 ? "package" : "de colis");
break;
}
String str = language == 1 ? "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元" :
- language == 2 ? " RMB " + driverActivityOnline.getMoney() + " will be awarded for " + driverActivityOnline.getOnline() + " hours online" :
- " Bonus de " + driverActivityOnline.getMoney() + " $pour " + driverActivityOnline.getOnline() + " heures cumulées en ligne";
+ language == 2 ? " for " + driverActivityOnline.getOnline() + " hours to get a reward of GHS" + driverActivityOnline.getMoney():
+ " pendant " + driverActivityOnline.getOnline() + " heures afin d'obtenir une récompense de GHS" + driverActivityOnline.getMoney();
activityWarpper.setContent(sb.append(str).toString());
activityWarpper.setCarryOut((dah.getCarryOut() == 2 || hour > driverActivityOnline.getOnline()) ? driverActivityOnline.getOnline() + "/" +driverActivityOnline.getOnline() : hour + "/" + driverActivityOnline.getOnline());
break;
@@ -1556,8 +1569,8 @@
DriverActivityOrder driverActivityOrder = driverActivityOrderMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityOrder.getId());
activityWarpper.setContent(language == 1 ? "今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励" + driverActivityOrder.getMoney() + "元" :
- language == 2 ? "From " + driverActivityOrder.getStart() + " to " + driverActivityOrder.getEnd() + " today, a total of " + driverActivityOrder.getOrderNum() + " orders will be awarded " + driverActivityOrder.getMoney() + " yuan" :
- "De " + driverActivityOrder.getStart() + " à " + driverActivityOrder.getEnd() + " aujourd’hui, un total de " + driverActivityOrder.getOrderNum() + " commandes recevront " + driverActivityOrder.getMoney() + " yuans");
+ language == 2 ? "Today " + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + ", complete " + driverActivityOrder.getOrderNum() + " orders for a reward of GHS" + driverActivityOrder.getMoney() :
+ "Aujourd’hui de " + driverActivityOrder.getStart() + " à " + driverActivityOrder.getEnd() + ", complétez " + driverActivityOrder.getOrderNum() + " commandes pour une récompense de GHS" + driverActivityOrder.getMoney());
SimpleDateFormat sdf = new SimpleDateFormat("H:m");
Date start = sdf.parse(driverActivityOrder.getStart());
Date end = sdf.parse(driverActivityOrder.getEnd());
@@ -1578,9 +1591,16 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryHistory(Integer uid, Integer pageNum, Integer size) throws Exception {
+ public List<Map<String, Object>> queryHistory(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception {
pageNum = (pageNum - 1) * size;
- return driverActivityHistoryMapper.query(uid, pageNum, size);
+ List<Map<String, Object>> list = driverActivityHistoryMapper.query(uid, pageNum, size);
+ for (Map<String, Object> map : list) {
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ }
+ return list;
}
@@ -1626,12 +1646,13 @@
document1.getElementById("driverAudit").remove();
document1.getElementById("carAudit").remove();
+ document1.getElementsByTag("title").get(0).text("今日活动");
Element rewardToday_user = document1.getElementById("rewardToday_user");
rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday_award = document1.getElementById("rewardToday_award");
rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
Element rewardToday_content = document1.getElementById("rewardToday_content");
- rewardToday_content.text("邀请司机注册即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
+ rewardToday_content.text("邀请司机注册即可获得奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
}
if (2 == language) {
document1.getElementById("chinese").remove();
@@ -1646,6 +1667,7 @@
document1.getElementById("driverAudit1").remove();
document1.getElementById("carAudit1").remove();
+ document1.getElementsByTag("title").get(0).text("Today's activities");
Element rewardToday1_user = document1.getElementById("rewardToday1_user");
rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday1_award = document1.getElementById("rewardToday1_award");
@@ -1666,6 +1688,7 @@
document1.getElementById("driverAudit2").remove();
document1.getElementById("carAudit2").remove();
+ document1.getElementsByTag("title").get(0).text("Activités du jour");
Element rewardToday2_user = document1.getElementById("rewardToday2_user");
rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
@@ -1673,7 +1696,7 @@
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
rewardToday2_content.text("Invitez les conducteurs à s’inscrire et à recevoir des récompenses. Notez que cet événement est limité dans le temps, veuillez consulter la plateforme I-GO pour plus de détails.");
}
- EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui", document1.html());
+ EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -1705,7 +1728,7 @@
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
tEmail.setType(2);
- tEmail.setName(language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui");
+ tEmail.setName(language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour");
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
String week = EmailUtil.getWeek(language, i);
@@ -1750,6 +1773,7 @@
document1.getElementById("driverAudit").remove();
document1.getElementById("carAudit").remove();
+ document1.getElementsByTag("title").get(0).text("今日活动");
Element rewardToday_user = document1.getElementById("rewardToday_user");
rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday_award = document1.getElementById("rewardToday_award");
@@ -1770,6 +1794,7 @@
document1.getElementById("driverAudit1").remove();
document1.getElementById("carAudit1").remove();
+ document1.getElementsByTag("title").get(0).text("Today's activities");
Element rewardToday1_user = document1.getElementById("rewardToday1_user");
rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday1_award = document1.getElementById("rewardToday1_award");
@@ -1790,6 +1815,7 @@
document1.getElementById("driverAudit2").remove();
document1.getElementById("carAudit2").remove();
+ document1.getElementsByTag("title").get(0).text("Activités du jour");
Element rewardToday2_user = document1.getElementById("rewardToday2_user");
rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
@@ -1797,7 +1823,7 @@
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
rewardToday2_content.text("Invitez les conducteurs à s’inscrire et à recevoir des récompenses. Notez que cet événement est limité dans le temps, veuillez consulter la plateforme I-GO pour plus de détails.");
}
- EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui", document1.html());
+ EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -1829,7 +1855,7 @@
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
tEmail.setType(2);
- tEmail.setName(language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui");
+ tEmail.setName(language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour");
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
String week = EmailUtil.getWeek(language, i);
@@ -1875,6 +1901,7 @@
document1.getElementById("driverAudit").remove();
document1.getElementById("carAudit").remove();
+ document1.getElementsByTag("title").get(0).text("今日活动");
Element rewardToday_user = document1.getElementById("rewardToday_user");
rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday_award = document1.getElementById("rewardToday_award");
@@ -1895,6 +1922,7 @@
document1.getElementById("driverAudit1").remove();
document1.getElementById("carAudit1").remove();
+ document1.getElementsByTag("title").get(0).text("Today's activities");
Element rewardToday1_user = document1.getElementById("rewardToday1_user");
rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday1_award = document1.getElementById("rewardToday1_award");
@@ -1915,6 +1943,7 @@
document1.getElementById("driverAudit2").remove();
document1.getElementById("carAudit2").remove();
+ document1.getElementsByTag("title").get(0).text("Activités du jour");
Element rewardToday2_user = document1.getElementById("rewardToday2_user");
rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
@@ -1922,7 +1951,7 @@
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
rewardToday2_content.text("Accumulé en ligne " + driverActivityOnline.getOnline() + " heures aujourd’hui pour obtenir des récompenses d’événement. Notez que cet événement est limité dans le temps, veuillez consulter la plateforme I-GO pour plus de détails.");
}
- EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui", document1.html());
+ EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -1954,7 +1983,7 @@
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
tEmail.setType(2);
- tEmail.setName(language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui");
+ tEmail.setName(language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour");
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
String week = EmailUtil.getWeek(language, i);
@@ -2000,6 +2029,7 @@
document1.getElementById("driverAudit").remove();
document1.getElementById("carAudit").remove();
+ document1.getElementsByTag("title").get(0).text("今日活动");
Element rewardToday_user = document1.getElementById("rewardToday_user");
rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday_award = document1.getElementById("rewardToday_award");
@@ -2020,6 +2050,7 @@
document1.getElementById("driverAudit1").remove();
document1.getElementById("carAudit1").remove();
+ document1.getElementsByTag("title").get(0).text("Today's activities");
Element rewardToday1_user = document1.getElementById("rewardToday1_user");
rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday1_award = document1.getElementById("rewardToday1_award");
@@ -2040,6 +2071,7 @@
document1.getElementById("driverAudit2").remove();
document1.getElementById("carAudit2").remove();
+ document1.getElementsByTag("title").get(0).text("Activités du jour");
Element rewardToday2_user = document1.getElementById("rewardToday2_user");
rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
@@ -2047,7 +2079,7 @@
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
rewardToday2_content.text("Effectuez " + driverActivityOrder.getOrderNum() + " commandes au total aujourd’hui pour obtenir des récompenses d’événement. Notez que cet événement est limité dans le temps, veuillez consulter la plateforme I-GO pour plus de détails.");
}
- EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui", document1.html());
+ EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -2079,7 +2111,7 @@
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
tEmail.setType(2);
- tEmail.setName(language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui");
+ tEmail.setName(language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour");
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
String week = EmailUtil.getWeek(language, i);
@@ -2150,6 +2182,7 @@
document1.getElementById("driverAudit").remove();
document1.getElementById("carAudit").remove();
+ document1.getElementsByTag("title").get(0).text("在线时长奖励");
Element reward_user = document1.getElementById("reward_user");
reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward_content = document1.getElementById("reward_content");
@@ -2168,6 +2201,7 @@
document1.getElementById("driverAudit1").remove();
document1.getElementById("carAudit1").remove();
+ document1.getElementsByTag("title").get(0).text("Online-duration reward");
Element reward1_user = document1.getElementById("reward1_user");
reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward1_content = document1.getElementById("reward1_content");
@@ -2186,12 +2220,13 @@
document1.getElementById("driverAudit2").remove();
document1.getElementById("carAudit2").remove();
+ document1.getElementsByTag("title").get(0).text("Récompenses de temps en ligne");
Element reward2_user = document1.getElementById("reward2_user");
reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward2_content = document1.getElementById("reward2_content");
reward2_content.text("Accumulé en ligne pendant " + dao.getOnline() + " heure aujourd’hui, obtenez la récompense GHS " + dah.getMoney() + ", s’il vous plaît vérifier");
}
- EmailUtil.send(driver.getEmail(), language == 1 ? "在线时长奖励" : language == 2 ? "Online Time Rewards" : "Récompenses de temps en ligne", document1.html());
+ EmailUtil.send(driver.getEmail(), language == 1 ? "在线时长奖励" : language == 2 ? "Online-duration reward" : "Récompenses de temps en ligne", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -2223,7 +2258,7 @@
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
tEmail.setType(2);
- tEmail.setName(language == 1 ? "在线时长奖励" : language == 2 ? "Online Time Rewards" : "Récompenses de temps en ligne");
+ tEmail.setName(language == 1 ? "在线时长奖励" : language == 2 ? "Online-duration reward" : "Récompenses de temps en ligne");
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
String week = EmailUtil.getWeek(language, i);
@@ -2277,6 +2312,7 @@
document1.getElementById("driverAudit").remove();
document1.getElementById("carAudit").remove();
+ document1.getElementsByTag("title").get(0).text("累计接单奖励");
Element reward_user = document1.getElementById("reward_user");
reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward_content = document1.getElementById("reward_content");
@@ -2295,6 +2331,7 @@
document1.getElementById("driverAudit1").remove();
document1.getElementById("carAudit1").remove();
+ document1.getElementsByTag("title").get(0).text("Cumulative orders reward");
Element reward1_user = document1.getElementById("reward1_user");
reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward1_content = document1.getElementById("reward1_content");
@@ -2313,13 +2350,14 @@
document1.getElementById("driverAudit2").remove();
document1.getElementById("carAudit2").remove();
+ document1.getElementsByTag("title").get(0).text("Récompense cumulée des commandes");
Element reward2_user = document1.getElementById("reward2_user");
reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward2_content = document1.getElementById("reward2_content");
reward2_content.text("Un total de " + dao.getOrderNum() + " commandes ont été reçues aujourd’hui, et la récompense GHS " + dah.getMoney() + " sera décernée, s’il vous plaît vérifier");
}
- EmailUtil.send(driver.getEmail(), language == 1 ? "累计接单奖励" : language == 2 ? "Cumulative Order Rewards" : "Récompenses de commande cumulées", document1.html());
+ EmailUtil.send(driver.getEmail(), language == 1 ? "累计接单奖励" : language == 2 ? "Cumulative orders reward" : "Récompense cumulée des commandes", document1.html());
String randomString = ToolUtil.getRandomString(10);
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -2351,7 +2389,7 @@
tEmail.setLink(link);
tEmail.setUserId(driver.getId());
tEmail.setType(2);
- tEmail.setName(language == 1 ? "累计接单奖励" : language == 2 ? "Cumulative Order Rewards" : "Récompenses de commande cumulées");
+ tEmail.setName(language == 1 ? "累计接单奖励" : language == 2 ? "Cumulative orders reward" : "Récompense cumulée des commandes");
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
String week = EmailUtil.getWeek(language, i);
--
Gitblit v1.7.1