From 021640e69b32dbd9b88a538402671c47f280df9e Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 31 一月 2024 15:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java |  704 ++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 437 insertions(+), 267 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 3836f67..4622156 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
@@ -177,13 +177,13 @@
             Driver driver1 = driverMapper.queryByPhone(phone);
             if(null != driver1){
                 if(driver1.getAuthState() == 1){
-                    return ResultUtil.error(language == 1 ? "该司机正在审核中" : language == 2 ? "The driver is currently under review" : "The driver is currently under review");
+                    return ResultUtil.error(language == 1 ? "该司机正在审核中" : language == 2 ? "The driver is being reviewed." : "Le chauffeur est en cours d’examen.");
                 }
                 if(driver1.getAuthState() == 2){
-                    return ResultUtil.error(language == 1 ? "该司机已存在" : language == 2 ? "The driver already exists" : "Les Driver already exists");
+                    return ResultUtil.error(language == 1 ? "该司机已存在" : language == 2 ? "The driver is already existent." : "Le chauffeur existe déjà.");
                 }
                 if(driver1.getAuthState() == 3){
-                    return ResultUtil.error(language == 1 ? "该司机账号已被冻结" : language == 2 ? "The driver's account has been frozen" : "Le compte du conducteur a été froid");
+                    return ResultUtil.error(language == 1 ? "该司机账号已被冻结" : language == 2 ? "Driver account is frozen." : "Le compte du chauffeur est gelé.");
                 }
             }
         }
@@ -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 delivery 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 livraison 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();
     }
 
@@ -297,10 +301,10 @@
     @Override
     public boolean checkCaptcha(String email, String phone, String code) throws Exception {
         Object value = redisUtil.getValue(ToolUtil.isNotEmpty(email) ? email : phone);
+        redisUtil.remove(ToolUtil.isNotEmpty(email) ? email : phone);
         if("1246".equals(code)){
             return true;
         }
-
         if(null != value && code.equals(String.valueOf(value))){
             return true;
         }else{
@@ -315,8 +319,9 @@
      */
     @Override
     public ResultUtil registeredDriver(String phoneOperator, String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language) throws Exception {
+        Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据
         ResultUtil<LoginWarpper> result = this.registeredDriver(phoneOperator, phone, code, password,uid,type, language);
-        if(result.getCode() == 200 && null != uid){
+        if(null == driver1 && result.getCode() == 200 && null != uid){
             if(type == 2){
                 Driver driver = driverMapper.selectById(uid);
                 List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
@@ -326,6 +331,14 @@
                         bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
                         incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));
                     }
+
+                    DriverActivityHistory dah = new DriverActivityHistory();
+                    dah.setActivityId(Integer.valueOf(map.get("id").toString()));
+                    dah.setDriverId(uid);
+                    dah.setType(1);
+                    DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectOne(dah);
+                    driverActivityHistory.setCarryOut(2);
+                    driverActivityHistoryMapper.updateById(driverActivityHistory);
                 }
                 driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                 driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -348,6 +361,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 +380,7 @@
                         document.getElementById("driverAudit1").remove();
                         document.getElementById("carAudit1").remove();
 
+                        document.getElementsByTag("title").get(0).text("Reward-driver notice");
                         Element invite1_user = document.getElementById("invite1_user");
                         invite1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                         Element invite1_content = document.getElementById("invite1_content");
@@ -384,12 +399,13 @@
                         document.getElementById("driverAudit2").remove();
                         document.getElementById("carAudit2").remove();
 
+                        document.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
                         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 ? "Reward-driver notice" : "Avis de chauffeur de récompense",  document.html());
                     String randomString = ToolUtil.getRandomString(10);
                     //开始生成pdf收据和html收据
                     File file = new File("/usr/local/nginx/html/files/html/");
@@ -404,33 +420,22 @@
                     fileWriter.write(document.html());
                     fileWriter.flush();
                     fileWriter.close();
-                    FileInputStream fileInputStream = new FileInputStream(file);
-                    File file1 = new File("/usr/local/nginx/html/files/pdf/");
-                    if(!file1.exists()){
-                        file1.mkdirs();
-                    }
-                    file1 = new File("/usr/local/nginx/html/files/pdf/invitation_" + randomString + ".pdf");
-                    if(!file1.exists()){
-                        file1.createNewFile();
-                    }
-                    FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                    HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
 
                     String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html";
                     TEmail tEmail = new TEmail();
                     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 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
                     tEmail.setCreateTime(new Date());
                     int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                     String week = EmailUtil.getWeek(language, i);
                     tEmail.setWeek(week);
                     boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                     if(am){
-                        tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+                        tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                     }else {
-                        tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                     }
                     emailService.insert(tEmail);
                 }
@@ -467,6 +472,201 @@
     }
 
 
+
+
+
+
+
+
+    /**
+     * 司机提交注册申请
+     * @throws Exception
+     */
+    @Override
+    public ResultUtil registeredDriver1(String phoneOperator, String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language) throws Exception {
+        boolean b = this.checkCaptcha("", phone, code);
+        if(!b){
+            return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
+        }
+        Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据
+        if(null != driver1){
+            driver1.setAuthState(1);
+            driverMapper.updateById(driver1);
+            return ResultUtil.success();
+        }
+
+        driver1 = driverMapper.queryByPhone(phone);
+        if(null != driver1){
+            return ResultUtil.error(language == 1 ? "手机号已被注册" : language == 2 ? "The mobile phone number has been registered" : "Le numéro de téléphone portable a été enregistré");
+        }
+        Driver driver = new Driver();
+        driver.setAccount(phone);
+        driver.setJobNumber(getCode());
+        driver.setPhoneOperator(phoneOperator);
+        driver.setPhone(phone);
+        driver.setPassword(ShiroKit.md5(password, salt));
+        driver.setAuthState(1);
+        driver.setState(1);
+        driver.setInsertTime(new Date());
+        driver.setAddType(1);
+        driver.setBalance(0D);
+        if(null!=uid){
+            driver.setUid(uid);
+        }
+        if(null!=type){
+            driver.setuType(type);
+        }
+        this.insert(driver);
+        if(null != uid){
+            if(type == 2){
+                driver = driverMapper.selectById(uid);
+                List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
+                BigDecimal bigDecimal = new BigDecimal("0");
+                for(Map<String, Object> map : query){
+                    if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
+                        bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
+                        incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));
+                    }
+                    DriverActivityHistory dah = new DriverActivityHistory();
+                    dah.setActivityId(Integer.valueOf(map.get("id").toString()));
+                    dah.setDriverId(uid);
+                    dah.setType(1);
+                    DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectOne(dah);
+                    driverActivityHistory.setCarryOut(2);
+                    driverActivityHistoryMapper.updateById(driverActivityHistory);
+                }
+                driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+                driverMapper.updateById(driver);
+
+                if(ToolUtil.isNotEmpty(driver.getEmail())){
+                    String path = templatePath + "driver/index.html";
+                    Document document = Jsoup.parse(new File(path), "UTF-8");
+                    if(1 == language){
+                        document.getElementById("english").remove();
+                        document.getElementById("french").remove();
+                        document.getElementById("user").remove();
+                        document.getElementById("settle").remove();
+                        document.getElementById("pass").remove();
+                        document.getElementById("email").remove();
+                        document.getElementById("bill").remove();
+                        document.getElementById("reward").remove();
+                        document.getElementById("rewardToday").remove();
+                        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");
+                        invite_content.text("您已成功邀请一位司机注册I-GO，获得奖励GHS " + bigDecimal.doubleValue() + "，请查收");
+                    }
+                    if(2 == language){
+                        document.getElementById("chinese").remove();
+                        document.getElementById("french").remove();
+                        document.getElementById("user1").remove();
+                        document.getElementById("settle1").remove();
+                        document.getElementById("pass1").remove();
+                        document.getElementById("email1").remove();
+                        document.getElementById("bill1").remove();
+                        document.getElementById("reward1").remove();
+                        document.getElementById("rewardToday1").remove();
+                        document.getElementById("driverAudit1").remove();
+                        document.getElementById("carAudit1").remove();
+
+                        document.getElementsByTag("title").get(0).text("Reward-driver notice");
+                        Element invite1_user = document.getElementById("invite1_user");
+                        invite1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
+                        Element invite1_content = document.getElementById("invite1_content");
+                        invite1_content.text("You have succeeded to invite a driver to register with I-GO, so you received a GHS " + bigDecimal.doubleValue() + " bonus, please check your balance.");
+                    }
+                    if(3 == language){
+                        document.getElementById("chinese").remove();
+                        document.getElementById("english").remove();
+                        document.getElementById("user2").remove();
+                        document.getElementById("settle2").remove();
+                        document.getElementById("pass2").remove();
+                        document.getElementById("email2").remove();
+                        document.getElementById("bill2").remove();
+                        document.getElementById("reward2").remove();
+                        document.getElementById("rewardToday2").remove();
+                        document.getElementById("driverAudit2").remove();
+                        document.getElementById("carAudit2").remove();
+
+                        document.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
+                        Element invite2_user = document.getElementById("invite2_user");
+                        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 ? "Reward-driver notice" : "Avis de chauffeur de récompense",  document.html());
+                    String randomString = ToolUtil.getRandomString(10);
+                    //开始生成pdf收据和html收据
+                    File file = new File("/usr/local/nginx/html/files/html/");
+                    if(!file.exists()){
+                        file.mkdirs();
+                    }
+                    file = new File("/usr/local/nginx/html/files/html/invitation_" + randomString + ".html");
+                    if(!file.exists()){
+                        file.createNewFile();
+                    }
+                    FileWriter fileWriter = new FileWriter(file);
+                    fileWriter.write(document.html());
+                    fileWriter.flush();
+                    fileWriter.close();
+
+                    String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html";
+                    TEmail tEmail = new TEmail();
+                    tEmail.setLink(link);
+                    tEmail.setUserId(driver.getId());
+                    tEmail.setType(2);
+                    tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
+                    tEmail.setCreateTime(new Date());
+                    int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+                    String week = EmailUtil.getWeek(language, i);
+                    tEmail.setWeek(week);
+                    boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+                    if(am){
+                        tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
+                    }else {
+                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
+                    }
+                    emailService.insert(tEmail);
+                }
+
+            }
+            if(type == 1){//用户分享
+                UserInfo userInfo = userInfoMapper.selectById(uid);
+                List<Map<String, Object>> query = userActivityInviteMapper.query(userInfo.getCompanyId());
+                Date date = new Date();
+                for(Map<String, Object> map : query){
+                    for(int i = Integer.valueOf(String.valueOf(map.get("totalNum"))); i > 0; i--){
+                        UserCouponRecord userCouponRecord = new UserCouponRecord();
+                        userCouponRecord.setActivityType(3);
+                        userCouponRecord.setCouponActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
+                        userCouponRecord.setCouponId(Integer.valueOf(String.valueOf(map.get("couponId"))));
+                        userCouponRecord.setState(1);
+                        Calendar calendar = Calendar.getInstance();
+                        calendar.setTime(date);
+                        calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + Integer.valueOf(String.valueOf(map.get("effective"))));
+                        userCouponRecord.setExpirationTime(calendar.getTime());
+                        userCouponRecord.setCouponType(Integer.valueOf(String.valueOf(map.get("couponType"))));
+                        userCouponRecord.setCouponUseType(Integer.valueOf(String.valueOf(map.get("couponUseType"))));
+                        userCouponRecord.setInsertTime(date);
+                        userCouponRecord.setFullMoney(Double.valueOf(String.valueOf(map.get("fullMoney"))));
+                        userCouponRecord.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
+                        userCouponRecord.setCompanyId(userInfo.getCompanyId());
+                        userCouponRecord.setUserId(uid);
+                        userCouponRecordMapper.insert(userCouponRecord);
+                    }
+                }
+            }
+        }
+        return ResultUtil.success();
+    }
+
+
     /**
      * 司机注册
      * @param phone
@@ -481,7 +681,7 @@
     public ResultUtil<LoginWarpper> registeredDriver(String phoneOperator, String phone, String code, String password,Integer uid,Integer uType, Integer language) throws Exception {
         boolean b = this.checkCaptcha("", phone, code);
         if(!b){
-            return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+            return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
         }
 
         Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据
@@ -547,7 +747,7 @@
         Driver driver = this.selectById(uid);
         driver.setLastName(registeredWarpper.getLastName());
         driver.setFirstName(registeredWarpper.getFirstName());
-//        driver.setSex(registeredWarpper.getSex());
+        driver.setSex(registeredWarpper.getSex());
         driver.setIdCard(registeredWarpper.getIdCard());
         driver.setBirthday(registeredWarpper.getBirthday());
 
@@ -555,7 +755,7 @@
         String[] city = new String[]{city1.getEnglishName()};
         Company query = companyCityService.query(city);
         if(null == query){
-            return ResultUtil.error(language == 1 ? "选择从业地暂未开通业务" : language == 2 ? "The selected place of employment has not yet opened business" : "Choisir un lieu de pratique pas encore ouvert");
+            return ResultUtil.error(language == 1 ? "选择从业地暂未开通业务" : language == 2 ? "Not yet to commence business at the workplace selected." : "N’a pas encore commencé ses activités sur le lieu de travail sélectionné.");
         }
         if(null != query){
             switch (query.getType()){
@@ -629,6 +829,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 +846,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 +863,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/");
@@ -679,33 +882,22 @@
             fileWriter.write(document1.html());
             fileWriter.flush();
             fileWriter.close();
-            FileInputStream fileInputStream = new FileInputStream(file);
-            File file1 = new File("/usr/local/nginx/html/files/pdf/");
-            if(!file1.exists()){
-                file1.mkdirs();
-            }
-            file1 = new File("/usr/local/nginx/html/files/pdf/registration_" + randomString + ".pdf");
-            if(!file1.exists()){
-                file1.createNewFile();
-            }
-            FileOutputStream fileOutputStream = new FileOutputStream(file1);
-            HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
 
             String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
             TEmail tEmail = new TEmail();
             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);
             tEmail.setWeek(week);
             boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
             if(am){
-                tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+                tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
             }else {
-                tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+                tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
             }
             emailService.insert(tEmail);
         }
@@ -724,13 +916,13 @@
      */
     @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" : "Code de vérification invalide");
-        }
+//        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 ? "The phone number is not registered" : "Numéro de téléphone non enregistré");
+            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é.");
         }
         driver.setPassword(ShiroKit.md5(password, salt));
         driverMapper.updateById(driver);
@@ -751,6 +943,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 +960,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 +977,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/");
@@ -801,38 +996,26 @@
             fileWriter.write(document1.html());
             fileWriter.flush();
             fileWriter.close();
-            FileInputStream fileInputStream = new FileInputStream(file);
-            File file1 = new File("/usr/local/nginx/html/files/pdf/");
-            if(!file1.exists()){
-                file1.mkdirs();
-            }
-            file1 = new File("/usr/local/nginx/html/files/pdf/reset_" + randomString + ".pdf");
-            if(!file1.exists()){
-                file1.createNewFile();
-            }
-            FileOutputStream fileOutputStream = new FileOutputStream(file1);
-            HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
 
             String link ="http://182.160.16.251:81/files/html/reset_" + randomString + ".html";
             TEmail tEmail = new TEmail();
             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);
             tEmail.setWeek(week);
             boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
             if(am){
-                tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+                tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
             }else {
-                tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+                tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
             }
             emailService.insert(tEmail);
         }
 
-        smsrecordService.saveData(6, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
         return ResultUtil.success();
     }
 
@@ -877,16 +1060,16 @@
     public ResultUtil<LoginWarpper> driverLogin(String phone, String password, Integer language) throws Exception {
         Driver driver = driverMapper.queryByPhone(phone);
         if(null == driver){
-            return ResultUtil.error(language == 1 ? "账号未注册" : language == 2 ? "Account not registered" : "Compte non enregistré");
+            return ResultUtil.error(language == 1 ? "账号未注册" : language == 2 ? "Account unregistered" : "Compte non enregistré");
         }
         if(driver.getAuthState() == 1){
-            return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
+            return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
         }
         if(driver.getAuthState() == 3){
-            return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
+            return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
         }
         if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){
-            return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
+            return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
         }
 
         String value = redisUtil.getValue("DEVICE_" + driver.getId());
@@ -1005,20 +1188,20 @@
             }
             //判断是否存在审核中的资料
             if(driver.getAuthState()==1){
-                return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data review, can't get out of the car" : "Données en cours de vérification, pas de voiture disponible");
+                return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data is being reviewed, unable to drive." : "Les données sont en cours d’examen, il est impossible de conduire.");
             }
             if(driver.getAuthState()==4){
-                return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
+                return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire.");
             }
             Car car = carService.selectById(driver.getCarId());
             if(car==null){
-                return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
+                return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire.");
             }
             if(car.getAuthState()==1){
-                return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data review, can't get out of the car" : "Données en cours de vérification, pas de voiture disponible");
+                return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data is being reviewed, unable to drive." : "Les données sont en cours d’examen, il est impossible de conduire.");
             }
             if(car.getAuthState()==4){
-                return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
+                return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire.");
             }
             driverWork = new DriverWork();
             driverWork.setState(1);
@@ -1110,9 +1293,9 @@
     public Map<String, Object> queryHomeNum(Integer uid, Integer language) throws Exception {
         Map<String, Object> map = new HashMap<>();
         //出租车
-        List<Map<String, Object>> list = orderTaxiService.queryOrderList(1, uid);
+        List<Map<String, Object>> list = orderTaxiService.queryOrderList(language, 1, uid);
         map.put("service", list.size());//服务中
-        list = orderTaxiService.queryOrderList(2, uid);
+        list = orderTaxiService.queryOrderList(language, 2, uid);
         map.put("reservation", list.size());//预约
         List<Map<String, Object>> list1 = orderLogisticsService.queryOrderList(uid, language);
         map.put("small", list1.size());//小件
@@ -1137,7 +1320,7 @@
             baseWarpper.setId(d.getType());
             switch (d.getType()){
                 case 1:
-                    baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course ");
+                    baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
                     break;
                 case 2:
                     baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi");
@@ -1146,7 +1329,7 @@
                     baseWarpper.setName(language == 1 ? "跨城出行" : language == 2 ? "Cross-town travel" : "Se déplacer à travers la ville");
                     break;
                 case 4:
-                    baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
+                    baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Delivery" : "Livraison");
                     break;
                 case 5:
                     baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville");
@@ -1172,8 +1355,20 @@
      * @throws Exception
      */
     @Override
-    public Map<String, Object> queryInfo(Integer uid) throws Exception {
+    public Map<String, Object> queryInfo(Integer language, Integer uid) throws Exception {
         Map<String, Object> map  = driverMapper.queryInfo(uid);
+        if(null != map.get("birthday")){
+            String birthday = map.get("birthday").toString();
+            map.put("birthday", DateUtil.conversionFormat(language, birthday));
+        }
+        if(null != map.get("networkCarlssueDate")){
+            String networkCarlssueDate = map.get("networkCarlssueDate").toString();
+            map.put("networkCarlssueDate", DateUtil.conversionFormat(language, networkCarlssueDate));
+        }
+        if(null != map.get("getDriverLicenseDate")){
+            String getDriverLicenseDate = map.get("getDriverLicenseDate").toString();
+            map.put("getDriverLicenseDate", DateUtil.conversionFormat(language, getDriverLicenseDate));
+        }
         if(ToolUtil.isEmpty(map.get("qrCode"))){
             //获取小程序二维码
             Driver driver = new Driver();
@@ -1198,19 +1393,17 @@
     public ResultUtil updatePhone(String phoneOperator, String phone, String code, Integer uid, Integer language) throws Exception {
         Driver driver = driverMapper.queryByPhone(phone);
         if(null != driver){
-            return ResultUtil.error(language == 1 ? "电话号码已被注册" : language == 2 ? "he phone number is registered" : "Le numéro de téléphone a été enregistré");
+            return ResultUtil.error(language == 1 ? "电话号码已被注册" : language == 2 ? "Mobile phone number has been registered." : "Le numéro de téléphone portable a été enregistré.");
         }
         boolean b = this.checkCaptcha("", phone, code);
         if(!b){
-            return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+            return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
         }
         Driver driver1 = this.selectById(uid);
         driver1.setAccount(phone);
         driver1.setPhoneOperator(phoneOperator);
         driver1.setPhone(phone);
         this.updateById(driver1);
-
-        smsrecordService.saveData(7, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
         return ResultUtil.success();
     }
 
@@ -1261,6 +1454,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() + "，");
             }
@@ -1277,6 +1471,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() + "，");
             }
@@ -1293,10 +1488,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/");
@@ -1311,33 +1507,22 @@
             fileWriter.write(document1.html());
             fileWriter.flush();
             fileWriter.close();
-            FileInputStream fileInputStream = new FileInputStream(file);
-            File file1 = new File("/usr/local/nginx/html/files/pdf/");
-            if(!file1.exists()){
-                file1.mkdirs();
-            }
-            file1 = new File("/usr/local/nginx/html/files/pdf/reset_" + randomString + ".pdf");
-            if(!file1.exists()){
-                file1.createNewFile();
-            }
-            FileOutputStream fileOutputStream = new FileOutputStream(file1);
-            HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
 
             String link ="http://182.160.16.251:81/files/html/reset_" + randomString + ".html";
             TEmail tEmail = new TEmail();
             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);
             tEmail.setWeek(week);
             boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
             if(am){
-                tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+                tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
             }else {
-                tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+                tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
             }
             emailService.insert(tEmail);
         }
@@ -1355,24 +1540,24 @@
     public ResultUtil replaceCar(Integer carId, Integer uid, Integer language) throws Exception {
         Driver driver = this.selectById(uid);
         if(driver.getState() == 3){
-            return ResultUtil.error(language == 1 ? "还在服务中，不能更换" : language == 2 ? "It is still in service and cannot be replaced" : "Toujours en service, non échangeable");
+            return ResultUtil.error(language == 1 ? "还在服务中，不能更换" : language == 2 ? "On trip, unable to change." : "En service, il est impossible de se changer.");
         }
         Car car = carService.selectById(carId);
         if(null == car){
             return ResultUtil.error(language == 1 ? "车辆无效" : language == 2 ? "Invalid vehicle" : "Véhicule non valide");
         }
         if(car.getAuthState() == 1){
-            return ResultUtil.error(language == 1 ? "车辆正在审核中" : language == 2 ? "The vehicle is under review" : "Véhicule en révision");
+            return ResultUtil.error(language == 1 ? "车辆正在审核中" : language == 2 ? "Vehicle is being reviewed." : "Le véhicule est en cours d’examen.");
         }
         if(car.getAuthState() == 3){
-            return ResultUtil.error(language == 1 ? "车辆已冻结" : language == 2 ? "Vehicle frozen" : "Le véhicule a été gelé");
+            return ResultUtil.error(language == 1 ? "车辆已冻结" : language == 2 ? "Vehicle is frozen." : "Le véhicule est gelé.");
         }
         if(car.getAuthState() == 4){
-            return ResultUtil.error(language == 1 ? "车辆审核不通过" : language == 2 ? "Vehicle audit failed" : "Échec de l’audit du véhicule");
+            return ResultUtil.error(language == 1 ? "车辆审核不通过" : language == 2 ? "Vehicle is not verified and qualified." : "Le véhicule n’est pas vérifié ni qualifié.");
         }
         boolean idle = carService.idle(carId);
         if(!idle){
-            return ResultUtil.error(language == 1 ? "车辆已被绑定了" : language == 2 ? "The vehicle has been bound" : "e véhicule a été lié");
+            return ResultUtil.error(language == 1 ? "车辆已被绑定了" : language == 2 ? "Vehicle has been bound." : "Le véhicule a été connecté.");
         }
         driver.setCarId(carId);
         this.updateById(driver);
@@ -1444,8 +1629,8 @@
      * @throws Exception
      */
     @Override
-    public List<Map<String, Object>> queryPenalties(Integer pageNum, Integer size, Integer uid) throws Exception {
-        List<Map<String, Object>> list = reassignService.queryList(uid, pageNum, size);
+    public List<Map<String, Object>> queryPenalties(Integer language, Integer pageNum, Integer size, Integer uid) throws Exception {
+        List<Map<String, Object>> list = reassignService.queryList(language, uid, pageNum, size);
         return list;
     }
 
@@ -1459,8 +1644,8 @@
      * @throws Exception
      */
     @Override
-    public List<Map<String, Object>> queryActivityIncome(Integer uid, Integer pageNum, Integer size) throws Exception {
-        List<Map<String, Object>> query = incomeService.query(2, uid, 1, pageNum, size);
+    public List<Map<String, Object>> queryActivityIncome(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception {
+        List<Map<String, Object>> query = incomeService.query(language,2, uid, Arrays.asList(1), pageNum, size);
         return query;
     }
 
@@ -1474,8 +1659,8 @@
      * @throws Exception
      */
     @Override
-    public List<Map<String, Object>> queryTotalRevenue(Integer uid, Integer pageNum, Integer size) throws Exception {
-        List<Map<String, Object>> query = incomeService.query(2, uid, 2, pageNum, size);
+    public List<Map<String, Object>> queryTotalRevenue(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception {
+        List<Map<String, Object>> query = incomeService.query(language, 2, uid, Arrays.asList(2, 3), pageNum, size);
         return query;
     }
 
@@ -1491,56 +1676,66 @@
         List<ActivityWarpper> list = new ArrayList<>();
         Map<String, Date> date = dateUtil.getStartAndEndDate(time);
         List<DriverActivityHistory> driverActivityHistories = driverActivityHistoryMapper.queryList(uid, null, null, date.get("startTime"), date.get("endTime"));
+
+        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
         for(DriverActivityHistory dah : driverActivityHistories){
             ActivityWarpper activityWarpper = new ActivityWarpper();
             switch (dah.getType()){
                 case 1://邀请司机注册
                     DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredMapper.selectById(dah.getActivityId());
                     activityWarpper.setId(driverActivityRegistered.getId());
-                    activityWarpper.setContent("邀请司机注册奖励" + driverActivityRegistered.getMoney() + "元");
+                    activityWarpper.setContent(language == 1 ? "邀请司机注册奖励GHS" + driverActivityRegistered.getMoney() :
+                            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("邀请用户注册奖励" + driverActivityRegistered1.getMoney() + "元");
+                    activityWarpper.setContent(language == 1 ? "邀请用户注册奖励GHS" + driverActivityRegistered1.getMoney() :
+                            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("今日");
-                    DriverWork driverWork = driverWorkMapper.queryNewWork(uid, driverActivityOnline.getType(), 1);
+                    StringBuffer sb = new StringBuffer(language == 1 ? "今日" :
+                            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 != driverWork){
-                        hour = Long.valueOf((System.currentTimeMillis() - driverWork.getStartTime().getTime()) / 3600000).intValue();
+                    if(null != query){
+                        hour = Long.valueOf(query.getDuration() / 3600).intValue();
                     }
                     switch (driverActivityOnline.getType()){
                         case 1:
-                            sb.append(language == 1 ? "打车" : language == 2 ? "Ride" : "Rouler");
+                            sb.append(language == 1 ? "打车" : language == 2 ? "ride" : "de course");
                             break;
                         case 2:
                             sb.append("出租车");
-
-                            break;
+                            continue;
                         case 3:
                             sb.append("城际出行");
-                            break;
+                            continue;
                         case 4:
-                            sb.append(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
+                            sb.append(language == 1 ? "包裹" : language == 2 ? "delivery" : "de livraison");
                             break;
                     }
-                    String str = "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元";
+                    String str = language == 1 ? "累计在线" +driverActivityOnline.getOnline() + "小时奖励GHS" +driverActivityOnline.getMoney():
+                            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;
                 case 4://订单量
                     DriverActivityOrder driverActivityOrder = driverActivityOrderMapper.selectById(dah.getActivityId());
                     activityWarpper.setId(driverActivityOrder.getId());
-                    activityWarpper.setContent("今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励" + driverActivityOrder.getMoney() + "元");
-                    SimpleDateFormat sdf = new SimpleDateFormat("H:m");
-                    Date start = sdf.parse(driverActivityOrder.getStart());
-                    Date end = sdf.parse(driverActivityOrder.getEnd());
+                    activityWarpper.setContent(language == 1 ? "今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励GHS" + driverActivityOrder.getMoney():
+                            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("yyyy-MM-dd HH:mm:ss");
+                    Date start = sdf.parse(sdf1.format(time) + " " + driverActivityOrder.getStart() + ":00");
+                    Date end = sdf.parse(sdf1.format(time) + " " + driverActivityOrder.getEnd() + ":59");
                     Integer integer = orderService.queryOrderNum(uid, start, end);
-                    activityWarpper.setCarryOut(integer > driverActivityOrder.getOrderNum() ? driverActivityOrder.getOrderNum() + "/" + driverActivityOrder.getOrderNum() : integer + "/" + driverActivityOrder.getOrderNum());
+                    activityWarpper.setCarryOut(integer.compareTo(driverActivityOrder.getOrderNum()) > 0 ? driverActivityOrder.getOrderNum() + "/" + driverActivityOrder.getOrderNum() : integer + "/" + driverActivityOrder.getOrderNum());
                     break;
             }
             list.add(activityWarpper);
@@ -1556,9 +1751,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;
     }
 
 
@@ -1604,12 +1806,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("邀请司机注册即可获得奖励。\n注意此活动是有时间限制的，详情请查看I-GO平台。");
                         }
                         if (2 == language) {
                             document1.getElementById("chinese").remove();
@@ -1624,12 +1827,13 @@
                             document1.getElementById("driverAudit1").remove();
                             document1.getElementById("carAudit1").remove();
 
+                            document1.getElementsByTag("title").get(0).text("Invite drivers and earn");
                             Element rewardToday1_user = document1.getElementById("rewardToday1_user");
                             rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             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 and get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
+                            rewardToday1_content.text("Get a bonus on I-GO today.\nInvite drivers to register to get the bonus.\nNote that this is a limited-time offer. Check your app for more details.");
                         }
                         if (3 == language) {
                             document1.getElementById("chinese").remove();
@@ -1644,14 +1848,15 @@
                             document1.getElementById("driverAudit2").remove();
                             document1.getElementById("carAudit2").remove();
 
+                            document1.getElementsByTag("title").get(0).text("Invitez des chauffeurs et gagnez de l’argent");
                             Element rewardToday2_user = document1.getElementById("rewardToday2_user");
-                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
+                            rewardToday2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             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 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.");
+                            rewardToday2_content.text("Obtenez un bonus sur I-GO dès aujourd’hui.\nInvitez les chauffeurs à s’inscrire pour obtenir le bonus.\nNotez 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 ? "today's activity" : "l'événement d'aujourd'hui", document1.html());
+                        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);
                         //开始生成pdf收据和html收据
                         File file = new File("/usr/local/nginx/html/files/html/");
@@ -1666,33 +1871,22 @@
                         fileWriter.write(document1.html());
                         fileWriter.flush();
                         fileWriter.close();
-                        FileInputStream fileInputStream = new FileInputStream(file);
-                        File file1 = new File("/usr/local/nginx/html/files/pdf/");
-                        if(!file1.exists()){
-                            file1.mkdirs();
-                        }
-                        file1 = new File("/usr/local/nginx/html/files/pdf/activity_" + randomString + ".pdf");
-                        if(!file1.exists()){
-                            file1.createNewFile();
-                        }
-                        FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                        HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
 
                         String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
                         TEmail tEmail = new TEmail();
                         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 ? "Invite drivers and earn" : "Invitez des chauffeurs et gagnez de l’argent");
                         tEmail.setCreateTime(new Date());
                         int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                         String week = EmailUtil.getWeek(language, i);
                         tEmail.setWeek(week);
                         boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                         if(am){
-                            tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+                            tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                         }else {
-                            tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+                            tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                         }
                         emailService.insert(tEmail);
                     }
@@ -1728,12 +1922,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("邀请用户注册即可获得奖励。\n 注意此活动是有时间限制的，详情请查看I-GO平台。");
                         }
                         if (2 == language) {
                             document1.getElementById("chinese").remove();
@@ -1748,12 +1943,13 @@
                             document1.getElementById("driverAudit1").remove();
                             document1.getElementById("carAudit1").remove();
 
+                            document1.getElementsByTag("title").get(0).text("Invite users and earn");
                             Element rewardToday1_user = document1.getElementById("rewardToday1_user");
                             rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             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 and get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
+                            rewardToday1_content.text("Get a bonus on I-GO today.\nInvite users to register to get the bonus.\nNote that this is a limited-time offer. Check your app for more details.");
                         }
                         if (3 == language) {
                             document1.getElementById("chinese").remove();
@@ -1768,14 +1964,15 @@
                             document1.getElementById("driverAudit2").remove();
                             document1.getElementById("carAudit2").remove();
 
+                            document1.getElementsByTag("title").get(0).text("Invitez des utilisateurs et gagnez de l’argent");
                             Element rewardToday2_user = document1.getElementById("rewardToday2_user");
-                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
+                            rewardToday2_user.text("Cher(ère)  " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             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 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.");
+                            rewardToday2_content.text("Obtenez un bonus sur I-GO dès aujourd’hui.\nInvitez les utilisateurs à s’inscrire pour obtenir le bonus.\nNotez 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 ? "today's activity" : "l'événement d'aujourd'hui", document1.html());
+                        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);
                         //开始生成pdf收据和html收据
                         File file = new File("/usr/local/nginx/html/files/html/");
@@ -1790,33 +1987,22 @@
                         fileWriter.write(document1.html());
                         fileWriter.flush();
                         fileWriter.close();
-                        FileInputStream fileInputStream = new FileInputStream(file);
-                        File file1 = new File("/usr/local/nginx/html/files/pdf/");
-                        if(!file1.exists()){
-                            file1.mkdirs();
-                        }
-                        file1 = new File("/usr/local/nginx/html/files/pdf/activity_" + randomString + ".pdf");
-                        if(!file1.exists()){
-                            file1.createNewFile();
-                        }
-                        FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                        HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
 
                         String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
                         TEmail tEmail = new TEmail();
                         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 ? "Invite users and earn" : "Invitez des utilisateurs et gagnez de l’argent");
                         tEmail.setCreateTime(new Date());
                         int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                         String week = EmailUtil.getWeek(language, i);
                         tEmail.setWeek(week);
                         boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                         if(am){
-                            tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+                            tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                         }else {
-                            tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+                            tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                         }
                         emailService.insert(tEmail);
                     }
@@ -1853,12 +2039,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("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
+                            rewardToday_content.text("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。\n 注意此活动是有时间限制的，详情请查看I-GO平台。");
                         }
                         if (2 == language) {
                             document1.getElementById("chinese").remove();
@@ -1873,12 +2060,13 @@
                             document1.getElementById("driverAudit1").remove();
                             document1.getElementById("carAudit1").remove();
 
+                            document1.getElementsByTag("title").get(0).text("Online-duration reward activity");
                             Element rewardToday1_user = document1.getElementById("rewardToday1_user");
                             rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday1_award = document1.getElementById("rewardToday1_award");
                             rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
                             Element rewardToday1_content = document1.getElementById("rewardToday1_content");
-                            rewardToday1_content.text("Accumulated online " + driverActivityOnline.getOnline() + " hours today to get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
+                            rewardToday1_content.text("Get a bonus for driving on I-GO today.\nStay online for " + driverActivityOnline.getOnline() + " hours to get the bonus.\nNote that this is a limited-time offer. Check your app for more details.");
                         }
                         if (3 == language) {
                             document1.getElementById("chinese").remove();
@@ -1893,14 +2081,15 @@
                             document1.getElementById("driverAudit2").remove();
                             document1.getElementById("carAudit2").remove();
 
+                            document1.getElementsByTag("title").get(0).text("Activité de récompense en ligne");
                             Element rewardToday2_user = document1.getElementById("rewardToday2_user");
-                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
+                            rewardToday2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday2_award = document1.getElementById("rewardToday2_award");
                             rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
                             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.");
+                            rewardToday2_content.text("Obtenez un bonus pour conduire sur I-GO dès aujourd’hui.\nRestez en ligne pendant " + driverActivityOnline.getOnline() + " heures pour obtenir le bonus.\nNotez 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 ? "today's activity" : "l'événement d'aujourd'hui", document1.html());
+                        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);
                         //开始生成pdf收据和html收据
                         File file = new File("/usr/local/nginx/html/files/html/");
@@ -1915,33 +2104,22 @@
                         fileWriter.write(document1.html());
                         fileWriter.flush();
                         fileWriter.close();
-                        FileInputStream fileInputStream = new FileInputStream(file);
-                        File file1 = new File("/usr/local/nginx/html/files/pdf/");
-                        if(!file1.exists()){
-                            file1.mkdirs();
-                        }
-                        file1 = new File("/usr/local/nginx/html/files/pdf/activity_" + randomString + ".pdf");
-                        if(!file1.exists()){
-                            file1.createNewFile();
-                        }
-                        FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                        HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
 
                         String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
                         TEmail tEmail = new TEmail();
                         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 ? "Online-duration reward activity" : "Activité de récompense en ligne");
                         tEmail.setCreateTime(new Date());
                         int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                         String week = EmailUtil.getWeek(language, i);
                         tEmail.setWeek(week);
                         boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                         if(am){
-                            tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+                            tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                         }else {
-                            tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+                            tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                         }
                         emailService.insert(tEmail);
                     }
@@ -1978,12 +2156,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("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
+                            rewardToday_content.text("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。\n 注意此活动是有时间限制的，详情请查看I-GO平台。");
                         }
                         if (2 == language) {
                             document1.getElementById("chinese").remove();
@@ -1998,12 +2177,13 @@
                             document1.getElementById("driverAudit1").remove();
                             document1.getElementById("carAudit1").remove();
 
+                            document1.getElementsByTag("title").get(0).text("Cumulative order activity");
                             Element rewardToday1_user = document1.getElementById("rewardToday1_user");
                             rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday1_award = document1.getElementById("rewardToday1_award");
                             rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
                             Element rewardToday1_content = document1.getElementById("rewardToday1_content");
-                            rewardToday1_content.text("Complete " + driverActivityOrder.getOrderNum() + " orders in total today to get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
+                            rewardToday1_content.text("Get a bonus for driving on I-GO today.\nStay online and complete " + driverActivityOrder.getOrderNum() + " trips to get the bonus.\nNote that this is a limited-time offer. Check your app for more details.");
                         }
                         if (3 == language) {
                             document1.getElementById("chinese").remove();
@@ -2018,14 +2198,15 @@
                             document1.getElementById("driverAudit2").remove();
                             document1.getElementById("carAudit2").remove();
 
+                            document1.getElementsByTag("title").get(0).text("Activité cumulée des commandes");
                             Element rewardToday2_user = document1.getElementById("rewardToday2_user");
-                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
+                            rewardToday2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
                             Element rewardToday2_award = document1.getElementById("rewardToday2_award");
                             rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
                             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.");
+                            rewardToday2_content.text("Obtenez un bonus pour conduire sur I-GO dès aujourd’hui.\nRestez en ligne et effectuez " + driverActivityOrder.getOrderNum() + " trajets pour obtenir le bonus.\nNotez 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 ? "today's activity" : "l'événement d'aujourd'hui", document1.html());
+                        EmailUtil.send(driver.getEmail(), language == 1 ? "累计接单奖励（活动）" : language == 2 ? "Cumulative order activity" : "Activité cumulée des commandes", document1.html());
                         String randomString = ToolUtil.getRandomString(10);
                         //开始生成pdf收据和html收据
                         File file = new File("/usr/local/nginx/html/files/html/");
@@ -2040,33 +2221,22 @@
                         fileWriter.write(document1.html());
                         fileWriter.flush();
                         fileWriter.close();
-                        FileInputStream fileInputStream = new FileInputStream(file);
-                        File file1 = new File("/usr/local/nginx/html/files/pdf/");
-                        if(!file1.exists()){
-                            file1.mkdirs();
-                        }
-                        file1 = new File("/usr/local/nginx/html/files/pdf/activity_" + randomString + ".pdf");
-                        if(!file1.exists()){
-                            file1.createNewFile();
-                        }
-                        FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                        HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
 
                         String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
                         TEmail tEmail = new TEmail();
                         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 ? "Cumulative order activity" : "Activité 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);
                         tEmail.setWeek(week);
                         boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                         if(am){
-                            tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+                            tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                         }else {
-                            tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+                            tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                         }
                         emailService.insert(tEmail);
                     }
@@ -2083,13 +2253,16 @@
     @Override
     public void taskMinute() throws Exception {
         Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
-        Integer language = 1;
+        Integer language = 2;
         //在线时长
         List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(null, 3, 1, date.get("startTime"), date.get("endTime"));
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         for(DriverActivityHistory dah : list){
             DriverActivityOnline dao = driverActivityOnlineMapper.selectById(dah.getActivityId());
-            Long duration = Long.valueOf(dao.getOnline() * 60 * 60 * 1000);
+            if(null == dao){
+                continue;
+            }
+            Long duration = Long.valueOf(dao.getOnline() * 3600);
             List<DriverOnline> driverOnlines = driverOnlineMapper.queryList(sdf.format(new Date()), duration);
             for (DriverOnline driverOnline : driverOnlines) {
                 if(dah.getDriverId().compareTo(driverOnline.getDriverId()) == 0){
@@ -2125,10 +2298,11 @@
                             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");
-                            reward_content.text("今日累计在线 " + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收");
+                            reward_content.text("今日累计在线" + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收。\n详情请查看I-GO平台。");
                         }
                         if (2 == language) {
                             document1.getElementById("chinese").remove();
@@ -2143,10 +2317,11 @@
                             document1.getElementById("driverAudit1").remove();
                             document1.getElementById("carAudit1").remove();
 
+                            document1.getElementsByTag("title").get(0).text("Reward-driver notice");
                             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("accumulated online for " + dao.getOnline() + " hour today, get reward GHS" + dah.getMoney() + ", please check");
+                            reward1_content.text("You stayed online for " + dao.getOnline() + " hours today, and got a bonus of GHS" + dah.getMoney() + ", please check.\nCheck your app for more details.");
                         }
                         if (3 == language) {
                             document1.getElementById("chinese").remove();
@@ -2161,12 +2336,13 @@
                             document1.getElementById("driverAudit2").remove();
                             document1.getElementById("carAudit2").remove();
 
+                            document1.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
                             Element reward2_user = document1.getElementById("reward2_user");
-                            reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
+                            reward2_user.text("Cher(ère) " + 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");
+                            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.\nConsultez votre application pour plus de détails.");
                         }
-                        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 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
                         String randomString = ToolUtil.getRandomString(10);
                         //开始生成pdf收据和html收据
                         File file = new File("/usr/local/nginx/html/files/html/");
@@ -2181,33 +2357,22 @@
                         fileWriter.write(document1.html());
                         fileWriter.flush();
                         fileWriter.close();
-                        FileInputStream fileInputStream = new FileInputStream(file);
-                        File file1 = new File("/usr/local/nginx/html/files/pdf/");
-                        if(!file1.exists()){
-                            file1.mkdirs();
-                        }
-                        file1 = new File("/usr/local/nginx/html/files/pdf/rewards_" + randomString + ".pdf");
-                        if(!file1.exists()){
-                            file1.createNewFile();
-                        }
-                        FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                        HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
 
                         String link ="http://182.160.16.251:81/files/html/rewards_" + randomString + ".html";
                         TEmail tEmail = new TEmail();
                         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 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
                         tEmail.setCreateTime(new Date());
                         int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                         String week = EmailUtil.getWeek(language, i);
                         tEmail.setWeek(week);
                         boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                         if(am){
-                            tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+                            tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                         }else {
-                            tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+                            tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                         }
                         emailService.insert(tEmail);
                     }
@@ -2252,10 +2417,11 @@
                         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");
-                        reward_content.text("今日累计接单 " + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收");
+                        reward_content.text("今日累计接单" + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收。\n详情请查看I-GO平台。");
                     }
                     if (2 == language) {
                         document1.getElementById("chinese").remove();
@@ -2270,10 +2436,11 @@
                         document1.getElementById("driverAudit1").remove();
                         document1.getElementById("carAudit1").remove();
 
+                        document1.getElementsByTag("title").get(0).text("Reward-driver notice");
                         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("A total of " + dao.getOrderNum() + " orders have been received today, and the reward GHS" + dah.getMoney() + " will be awarded, please check");
+                        reward1_content.text("You completed " + dao.getOrderNum() + " trips today, and got a bonus of GHS" + dah.getMoney() + ", please check.\nCheck your app for more details.");
                     }
                     if (3 == language) {
                         document1.getElementById("chinese").remove();
@@ -2288,13 +2455,14 @@
                         document1.getElementById("driverAudit2").remove();
                         document1.getElementById("carAudit2").remove();
 
+                        document1.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
                         Element reward2_user = document1.getElementById("reward2_user");
-                        reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
+                        reward2_user.text("Cher(ère) " + 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");
+                        reward2_content.text("Vous avez effectué " + dao.getOrderNum() + " trajets aujourd’hui et avez reçu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.\nConsultez votre application pour plus de détails.");
                     }
 
-                    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 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
                     String randomString = ToolUtil.getRandomString(10);
                     //开始生成pdf收据和html收据
                     File file = new File("/usr/local/nginx/html/files/html/");
@@ -2309,33 +2477,22 @@
                     fileWriter.write(document1.html());
                     fileWriter.flush();
                     fileWriter.close();
-                    FileInputStream fileInputStream = new FileInputStream(file);
-                    File file1 = new File("/usr/local/nginx/html/files/pdf/");
-                    if(!file1.exists()){
-                        file1.mkdirs();
-                    }
-                    file1 = new File("/usr/local/nginx/html/files/pdf/rewards_" + randomString + ".pdf");
-                    if(!file1.exists()){
-                        file1.createNewFile();
-                    }
-                    FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                    HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
 
                     String link ="http://182.160.16.251:81/files/html/rewards_" + randomString + ".html";
                     TEmail tEmail = new TEmail();
                     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 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
                     tEmail.setCreateTime(new Date());
                     int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                     String week = EmailUtil.getWeek(language, i);
                     tEmail.setWeek(week);
                     boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                     if(am){
-                        tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+                        tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                     }else {
-                        tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                     }
                     emailService.insert(tEmail);
                 }
@@ -2352,13 +2509,13 @@
     public ResultUtil loginByJobNumber(String jobNum, Integer language) {
         Driver driver = driverMapper.queryByJobNum(jobNum);
         if(null == driver){
-            return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
+            return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte.");
         }
         if(driver.getAuthState() == 1){
-            return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
+            return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
         }
         if(driver.getAuthState() == 3){
-            return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
+            return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
         }
         List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
         boolean b = true;
@@ -2369,7 +2526,7 @@
             }
         }
         if(b){
-            return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
+            return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
         }
 
         //开始自动设置接单类型，出车类型，上班状态
@@ -2450,13 +2607,13 @@
     public ResultUtil loginByIdentification(String identification, Integer language) throws Exception {
         Driver driver = driverMapper.queryByIdentification(identification);
         if(null == driver){
-            return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
+            return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte.");
         }
         if(driver.getAuthState() == 1){
-            return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
+            return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
         }
         if(driver.getAuthState() == 3){
-            return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
+            return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
         }
         List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
         boolean b = true;
@@ -2467,7 +2624,7 @@
             }
         }
         if(b){
-            return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
+            return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
         }
 
         //开始自动设置接单类型，出车类型，上班状态
@@ -2536,13 +2693,13 @@
     public ResultUtil loginByTaxiAptitudeCard(String taxiAptitudeCard, Integer language) throws Exception {
         Driver driver = driverMapper.queryByTaxiAptitudeCard(taxiAptitudeCard);
         if(null == driver){
-            return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
+            return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte.");
         }
         if(driver.getAuthState() == 1){
-            return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
+            return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
         }
         if(driver.getAuthState() == 3){
-            return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
+            return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
         }
         List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
         boolean b = true;
@@ -2553,7 +2710,7 @@
             }
         }
         if(b){
-            return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
+            return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
         }
 
         //开始自动设置接单类型，出车类型，上班状态
@@ -2642,10 +2799,10 @@
     public ResultUtil verificationPassword(String password, Integer driverId, Integer language) throws Exception {
         Driver driver = this.selectById(driverId);
         if(null == driver){
-            return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
+            return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau.");
         }
         if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){
-            return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
+            return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
         }
         return ResultUtil.success();
     }
@@ -2661,7 +2818,7 @@
     public ResultUtil setWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception {
         Driver driver = this.selectById(driverId);
         if(null == driver){
-            return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
+            return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau.");
         }
         driver.setWithdrawPassword(ShiroKit.md5(withdrawPassword, salt));
         this.updateById(driver);
@@ -2680,13 +2837,13 @@
     public ResultUtil verificationWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception {
         Driver driver = this.selectById(driverId);
         if(null == driver){
-            return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
+            return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau.");
         }
         if(null == driver.getWithdrawPassword()){
-            return ResultUtil.error(language == 1 ? "请先设置提现密码" : language == 2 ? "Please set the withdrawal password first" : "Veuillez d’abord définir un mot de passe de retrait");
+            return ResultUtil.error(language == 1 ? "请先设置提现密码" : language == 2 ? "Please set withdrawal password first." : "Veuillez d’abord définir le mot de passe de retrait.");
         }
         if(!driver.getWithdrawPassword().equals(ShiroKit.md5(withdrawPassword, salt))){
-            return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
+            return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
         }
         return ResultUtil.success();
     }
@@ -2722,14 +2879,28 @@
      * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      */
     @Override
-    public List<Map<String,Object>> queryMyInviteList(Integer type,Integer uid, Integer pageNum, Integer size) throws Exception {
+    public List<Map<String,Object>> queryMyInviteList(Integer language, Integer type,Integer uid, Integer pageNum, Integer size) throws Exception {
         pageNum = (pageNum - 1) * size;
         if(type==1){
             //乘客表uType为2表示是司机邀请的
-            return userInfoMapper.queryMyInviteUserList(2,uid,pageNum,size);
+            List<Map<String, Object>> list = userInfoMapper.queryMyInviteUserList(2, uid, pageNum, size);
+            for (Map<String, Object> map : list) {
+                if(null != map.get("insertTime")){
+                    String insertTime = map.get("insertTime").toString();
+                    map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
+                }
+            }
+            return list;
         }else if(type==2){
             //司机表uType为2表示是司机邀请的
-            return driverMapper.queryMyInviteDriverList(2,uid, pageNum, size);
+            List<Map<String, Object>> list = driverMapper.queryMyInviteDriverList(2, uid, pageNum, size);
+            for (Map<String, Object> map : list) {
+                if(null != map.get("insertTime")){
+                    String insertTime = map.get("insertTime").toString();
+                    map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
+                }
+            }
+            return list;
         }
         return null;
 
@@ -2782,7 +2953,6 @@
      * @param id
      */
     private void singlePointLogin(Integer id){
-        pushUtil.pushOffline(id, 2);
         //开始验证当前账号是否在别处登录
         String value = redisUtil.getValue("DRIVER_" + id);
         if(ToolUtil.isNotEmpty(value)){//将另外设备上的强迫下线（如果是车载端不需要下线）

--
Gitblit v1.7.1