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 |   47 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 39 insertions(+), 8 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 2665223..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
@@ -210,6 +210,7 @@
                 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,10 +281,11 @@
             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 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,8 +390,9 @@
                         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");
                     }
@@ -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,6 +670,7 @@
                 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() + ",");
             }
@@ -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,6 +795,7 @@
                 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() + ",");
             }
@@ -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,6 +1317,7 @@
                 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() + ",");
             }
@@ -1633,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();
@@ -1653,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");
@@ -1673,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");
@@ -1757,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");
@@ -1777,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");
@@ -1797,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");
@@ -1882,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");
@@ -1902,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");
@@ -1922,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");
@@ -2007,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");
@@ -2027,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");
@@ -2047,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");
@@ -2157,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");
@@ -2175,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");
@@ -2193,6 +2220,7 @@
                             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");
@@ -2284,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");
@@ -2302,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");
@@ -2320,6 +2350,7 @@
                         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");

--
Gitblit v1.7.1