From 13d2bd6a27f941cfd8f096a7ae2def858a565363 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 04 九月 2024 11:01:34 +0800
Subject: [PATCH] 修改2.0 bug

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 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..add9fcb 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
@@ -1986,7 +1986,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 +2007,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 +2028,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 +2109,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 +2130,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 +2151,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 +2233,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 +2254,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 +2275,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 +2357,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 +2378,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 +2399,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 +2502,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 +2521,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 +2540,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 +2621,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 +2640,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 +2659,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