From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 1032 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 607 insertions(+), 425 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 3a8f8b3..39f00d7 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
@@ -156,6 +156,9 @@
     
     @Resource
     private CarModelMapper carModelMapper;
+    
+    @Autowired
+    private ISettlementRecordService settlementRecordService;
 
 
     @Override
@@ -203,10 +206,11 @@
         redisUtil.setStrValue(phone, authCode, 5 * 60);//设置五分钟过期
         switch (language){
             case 1:
-                sms = "您的验证码为：" + authCode + "，该验证码5分钟内有效，请勿泄漏于他人！";
+//                sms = "您的验证码为：" + authCode + "，该验证码5分钟内有效，请勿泄漏于他人！";
+                sms = "Your verification code is " + authCode + ", it is valid within 5 minutes, please do not reveal it to others.";
                 break;
             case 2:
-                sms = "Your verification code is " + authCode + "，it is valid within 5 minutes, please do not reveal it to others.";
+                sms = "Your verification code is " + authCode + ", it is valid within 5 minutes, please do not reveal it to others.";
                 break;
             case 3:
                 sms = "Votre code de validation est " + authCode + " et il est valide pendant 5 minutes. Veuillez ne pas le révéler à d’autres personnes.";
@@ -327,27 +331,22 @@
         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());
+                Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
+                List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(null, 1, 1, date.get("startTime"), date.get("endTime"));
                 BigDecimal bigDecimal = new BigDecimal("0");
-                for(Map<String, Object> map : query){
-                    DriverActivityHistory dah = new DriverActivityHistory();
-                    dah.setActivityId(Integer.valueOf(map.get("id").toString()));
-                    dah.setDriverId(uid);
-                    dah.setType(1);
-                    DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectOne(dah);
+                for (DriverActivityHistory driverActivityHistory : list) {
+                    bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
+                    incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
                     driverActivityHistory.setCarryOut(2);
+                    driverActivityHistory.setCompletionTime(new Date());
                     driverActivityHistoryMapper.updateById(driverActivityHistory);
-                    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, driverActivityHistory.getId(), null, Double.valueOf(String.valueOf(map.get("money"))));
-                    }
                 }
                 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())){
+                if(list.size() > 0 && ToolUtil.isNotEmpty(driver.getEmail())){
                     String path = templatePath + "driver/index.html";
                     Document document = Jsoup.parse(new File(path), "UTF-8");
                     if(1 == language){
@@ -410,11 +409,11 @@
                     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/");
+                    File file = new File("/home/igotechgh/nginx/html/files/html/");
                     if(!file.exists()){
                         file.mkdirs();
                     }
-                    file = new File("/usr/local/nginx/html/files/html/invitation_" + randomString + ".html");
+                    file = new File("/home/igotechgh/nginx/html/files/html/invitation_" + randomString + ".html");
                     if(!file.exists()){
                         file.createNewFile();
                     }
@@ -423,7 +422,7 @@
                     fileWriter.flush();
                     fileWriter.close();
 
-                    String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html";
+                    String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html";
                     TEmail tEmail = new TEmail();
                     tEmail.setLink(link);
                     tEmail.setUserId(driver.getId());
@@ -522,121 +521,128 @@
         if(null != uid){
             if(type == 2){
                 driver = driverMapper.selectById(uid);
-                List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
+                Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
+                List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(uid, 1, 1, date.get("startTime"), date.get("endTime"));
                 BigDecimal bigDecimal = new BigDecimal("0");
-                for(Map<String, Object> map : query){
-                    DriverActivityHistory dah = new DriverActivityHistory();
-                    dah.setActivityId(Integer.valueOf(map.get("id").toString()));
-                    dah.setDriverId(uid);
-                    dah.setType(1);
-                    DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectOne(dah);
+                for (DriverActivityHistory driverActivityHistory : list) {
+                    bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
+                    incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
                     driverActivityHistory.setCarryOut(2);
+                    driverActivityHistory.setCompletionTime(new Date());
                     driverActivityHistoryMapper.updateById(driverActivityHistory);
-                    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, driverActivityHistory.getId(), null, Double.valueOf(String.valueOf(map.get("money"))));
+                }
+                if(bigDecimal.compareTo(BigDecimal.ZERO) > 0){
+                    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())){
+                        Driver finalDriver = driver;
+                        BigDecimal finalBigDecimal = bigDecimal;
+                        new Thread(new Runnable() {
+                            @Override
+                            public void run() {
+                                try {
+                                    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("您好 " + finalDriver.getFirstName() + "" + finalDriver.getLastName() + "，");
+                                        Element invite_content = document.getElementById("invite_content");
+                                        invite_content.text("您已成功邀请一位司机注册I-GO，获得奖励GHS " + finalBigDecimal.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 " + finalDriver.getFirstName() + "" + finalDriver.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 " + finalBigDecimal.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 " + finalDriver.getFirstName() + " " + finalDriver.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 " + finalBigDecimal.doubleValue() + ". Veuillez vérifier");
+                                    }
+                                    EmailUtil.send(finalDriver.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("/home/igotechgh/nginx/html/files/html/");
+                                    if(!file.exists()){
+                                        file.mkdirs();
+                                    }
+                                    file = new File("/home/igotechgh/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 ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html";
+                                    TEmail tEmail = new TEmail();
+                                    tEmail.setLink(link);
+                                    tEmail.setUserId(finalDriver.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);
+                                }catch (Exception e){
+                                    e.printStackTrace();
+                                }
+                            }
+                        }).start();
                     }
                 }
-                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);
@@ -760,18 +766,7 @@
             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()){
-                case 1://平台
-                    driver.setCompanyId(query.getId());
-                    break;
-                case 2://分公司
-                    driver.setCompanyId(query.getId());
-                    break;
-                case 3://加盟商
-                    driver.setCompanyId(query.getSuperiorId());
-                    driver.setFranchiseeId(query.getId());
-                    break;
-            }
+            driver.setCompanyId(query.getId());
         }
         driver.setHeadImgUrl(registeredWarpper.getHeadImgUrl());
         driver.setIdCardImgUrl1(registeredWarpper.getIdCardImgUrl1());
@@ -872,11 +867,11 @@
             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/");
+            File file = new File("/home/igotechgh/nginx/html/files/html/");
             if(!file.exists()){
                 file.mkdirs();
             }
-            file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html");
+            file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html");
             if(!file.exists()){
                 file.createNewFile();
             }
@@ -885,7 +880,7 @@
             fileWriter.flush();
             fileWriter.close();
 
-            String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
+            String link ="https://igo.i-go.group/files/html/registration_" + randomString + ".html";
             TEmail tEmail = new TEmail();
             tEmail.setLink(link);
             tEmail.setUserId(driver.getId());
@@ -986,11 +981,11 @@
             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/");
+            File file = new File("/home/igotechgh/nginx/html/files/html/");
             if(!file.exists()){
                 file.mkdirs();
             }
-            file = new File("/usr/local/nginx/html/files/html/reset_" + randomString + ".html");
+            file = new File("/home/igotechgh/nginx/html/files/html/reset_" + randomString + ".html");
             if(!file.exists()){
                 file.createNewFile();
             }
@@ -999,7 +994,7 @@
             fileWriter.flush();
             fileWriter.close();
 
-            String link ="http://182.160.16.251:81/files/html/reset_" + randomString + ".html";
+            String link ="https://igo.i-go.group/files/html/reset_" + randomString + ".html";
             TEmail tEmail = new TEmail();
             tEmail.setLink(link);
             tEmail.setUserId(driver.getId());
@@ -1029,7 +1024,7 @@
      */
     @Override
     public Map<String, Object> queryPhone(Double lat, Double lnt) throws Exception {
-        ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lnt);
+        ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lnt, null);
         if(null == reverseGeocode){
             System.err.println("获取地址异常");
             return null;
@@ -1094,22 +1089,38 @@
                 loginWarpper.setJumpCode("200000");
             }
         }
-    
-        //司机登录，添加谷歌上的车辆信息
-        Car car = carService.selectById(driver.getCarId());
-        if(null == car){
-            return ResultUtil.error(language == 1 ? "登录失败，请先绑定车辆" : language == 2 ? "Login failed, please bind the vehicle first" : "La connexion a échoué, veuillez d’abord lier le véhicule");
+        if(null != driver.getCarId()){
+            Car car = carService.selectById(driver.getCarId());
+            if(!StringUtils.hasLength(car.getVehicleId())){
+                car.setVehicleId(UUIDUtil.getRandomCode());
+                carService.updateById(car);
+            }
+            new Thread(()->{
+                try {
+                    CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+                    String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
+                    if(ToolUtil.isEmpty(vehicles)) {
+                        boolean createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                        if(!createVehicles){
+                            for (int i = 0; i < 5; i++) {
+                                createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                                if(createVehicles){
+                                    break;
+                                }
+                                try {
+                                    Thread.sleep(5000L);
+                                } catch (InterruptedException e) {
+                                    throw new RuntimeException(e);
+                                }
+                            }
+                        }
+                    }
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            }).start();
+            loginWarpper.setVehicleId(car.getVehicleId());
         }
-        if(!StringUtils.hasLength(car.getVehicleId())){
-            car.setVehicleId(UUIDUtil.getRandomCode());
-            carService.updateById(car);
-        }
-        String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
-        if(ToolUtil.isEmpty(vehicles)){
-            CarModel carModel = carModelMapper.selectById(car.getCarModelId());
-            fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
-        }
-        loginWarpper.setVehicleId(car.getVehicleId());
         return ResultUtil.success(loginWarpper);
     }
 
@@ -1128,25 +1139,6 @@
         Map<String, Object> map = driverMapper.queryHomeData(uid);
         int size = this.queryMyActivity(uid, new Date(), language).size();
         map.put("activity", size);
-        //获取司机待支付的现金支付订单推送司机支付
-//        new Thread(new Runnable() {
-//            @Override
-//            public void run() {
-//                List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("driverId", uid).eq("payType", 4)
-//                        .eq("driverPay", 1).eq("isDelete", 1));
-//                if(orderPrivateCars.size() > 0){
-//                    OrderPrivateCar orderPrivateCar = orderPrivateCars.get(0);
-//                    pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1);
-//                    return;
-//                }
-//                List<OrderLogistics> orderLogistics = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().eq("driverId", uid).eq("payType", 4)
-//                        .eq("isDelete", 1).eq("driverPay", 1));
-//                if(orderLogistics.size() > 0){
-//                    OrderLogistics orderLogistics1 = orderLogistics.get(0);
-//                    pushUtil.pushOfflinePayment(2, orderLogistics1.getDriverId(), orderLogistics1.getId(), orderLogistics1.getType());
-//                }
-//            }
-//        }).start();
         return map;
     }
 
@@ -1194,7 +1186,7 @@
             //检测是否有未完成的订单
             List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid, language);
             if(list.size() > 0){
-                return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "There are still outstanding orders, can not be off-duty operation" : "Il y a encore des commandes en suspens qui ne peuvent pas être exécutées");
+                return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "Outstanding orders ! So you can't get off work" : "Commandes en suspens ! Vous ne pouvez pas quitter le travail");
             }
             driverWork.setEndTime(new Date());
             driverWork.setState(2);
@@ -1207,22 +1199,69 @@
             }
     
             //司机下班，修改谷歌上的车辆信息
-            CarModel carModel = carModelMapper.selectById(car.getCarModelId());
-            String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
-            if(ToolUtil.isEmpty(vehicles)){
-                fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
-            }else{
-                fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
-            }
+            new Thread(()->{
+                try {
+                    CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+                    String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
+                    if(ToolUtil.isEmpty(vehicles)){
+                        boolean createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                        if(!createVehicles){
+                            for (int i = 0; i < 5; i++) {
+                                createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                                if(createVehicles){
+                                    break;
+                                }
+                                try {
+                                    Thread.sleep(5000L);
+                                } catch (InterruptedException e) {
+                                    throw new RuntimeException(e);
+                                }
+                            }
+                        }
+                        
+                        boolean updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                        if(!updateVehicles){
+                            for (int i = 0; i < 5; i++) {
+                                updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                                if(updateVehicles){
+                                    break;
+                                }
+                                try {
+                                    Thread.sleep(5000L);
+                                } catch (InterruptedException e) {
+                                    throw new RuntimeException(e);
+                                }
+                            }
+                        }
+                    }else{
+                        boolean updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                        if(!updateVehicles){
+                            for (int i = 0; i < 5; i++) {
+                                updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                                if(updateVehicles){
+                                    break;
+                                }
+                                try {
+                                    Thread.sleep(5000L);
+                                } catch (InterruptedException e) {
+                                    throw new RuntimeException(e);
+                                }
+                            }
+                        }
+                    }
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            }).start();
             switch (language){
                 case 1:
-                    audioUrl = "http://182.160.16.251:81/files/audio/system/AfterWork-CN.mp3";
+                    audioUrl = "https://igo.i-go.group/files/audio/system/AfterWork-CN.mp3";
                     break;
                 case 2:
-                    audioUrl = "http://182.160.16.251:81/files/audio/system/AfterWork-EN.mp3";
+                    audioUrl = "https://igo.i-go.group/files/audio/system/AfterWork-EN.mp3";
                     break;
                 case 3:
-                    audioUrl = "http://182.160.16.251:81/files/audio/system/AfterWork-FR.mp3";
+                    audioUrl = "https://igo.i-go.group/files/audio/system/AfterWork-FR.mp3";
                     break;
             }
         }else{
@@ -1251,6 +1290,7 @@
             if(car.getAuthState()==4){
                 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);
             driverWork.setDriverId(uid);
@@ -1265,28 +1305,79 @@
             }
             
             //司机上班，修改谷歌上的车辆信息
-            CarModel carModel = carModelMapper.selectById(car.getCarModelId());
-            String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
-            if(ToolUtil.isEmpty(vehicles)){
-                fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
-            }else{
-                fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
-            }
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+                        String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
+                        if(ToolUtil.isEmpty(vehicles)){
+                            boolean createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                            if(!createVehicles){
+                                for (int i = 0; i < 5; i++) {
+                                    createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                                    if(createVehicles){
+                                        break;
+                                    }
+                                    try {
+                                        Thread.sleep(5000L);
+                                    } catch (InterruptedException e) {
+                                        throw new RuntimeException(e);
+                                    }
+                                }
+                            }
+                            
+                            boolean updateVehicles = fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                            if(!updateVehicles){
+                                for (int i = 0; i < 5; i++) {
+                                    updateVehicles = fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                                    if(updateVehicles){
+                                        break;
+                                    }
+                                    try {
+                                        Thread.sleep(5000L);
+                                    } catch (InterruptedException e) {
+                                        throw new RuntimeException(e);
+                                    }
+                                }
+                            }
+                        }else{
+                            boolean updateVehicles = fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                            if(!updateVehicles){
+                                for (int i = 0; i < 5; i++) {
+                                    updateVehicles = fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+                                    if(updateVehicles){
+                                        break;
+                                    }
+                                    try {
+                                        Thread.sleep(5000L);
+                                    } catch (InterruptedException e) {
+                                        throw new RuntimeException(e);
+                                    }
+                                }
+                            }
+                        }
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
     
             switch (language){
                 case 1:
-                    audioUrl = "http://182.160.16.251:81/files/audio/system/AtWork-CN.mp3";
+                    audioUrl = "https://igo.i-go.group/files/audio/system/AtWork-CN.mp3";
                     break;
                 case 2:
-                    audioUrl = "http://182.160.16.251:81/files/audio/system/AtWork-EN.mp3";
+                    audioUrl = "https://igo.i-go.group/files/audio/system/AtWork-EN.mp3";
                     break;
                 case 3:
-                    audioUrl = "http://182.160.16.251:81/files/audio/system/AtWork-FR.mp3";
+                    audioUrl = "https://igo.i-go.group/files/audio/system/AtWork-FR.mp3";
                     break;
             }
         }
         this.updateById(driver);
         loginWarpper.setAudioUrl(audioUrl);
+        loginWarpper.setVehicleId(car.getVehicleId());
         return ResultUtil.success(loginWarpper);
     }
 
@@ -1309,7 +1400,7 @@
             //检测是否有未完成的订单
             List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid, language);
             if(list.size() > 0){
-                return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "There are still outstanding orders, can not be off-duty operation" : "Il y a encore des commandes en suspens qui ne peuvent pas être exécutées");
+                return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "Outstanding orders ! So you can't get off work" : "Commandes en suspens ! Vous ne pouvez pas quitter le travail");
             }
             driverWork.setEndTime(new Date());
             driverWork.setState(2);
@@ -1412,13 +1503,6 @@
             }
             maps.add(baseWarpper);
         }
-        DriverOrders query = driverOrdersMapper.query(uid, 1);
-        if(null == query){
-            query = new DriverOrders();
-            query.setDriverId(uid);
-            query.setType(1);
-            driverOrdersMapper.insert(query);
-        }
         return maps;
     }
 
@@ -1451,7 +1535,6 @@
             driver.setQrCode(QrCodeUtil.getQrCode(uid));
             driverMapper.updateById(driver);
         }
-        //减去本周的收入
         return map;
     }
 
@@ -1570,11 +1653,11 @@
             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/");
+            File file = new File("/home/igotechgh/nginx/html/files/html/");
             if(!file.exists()){
                 file.mkdirs();
             }
-            file = new File("/usr/local/nginx/html/files/html/reset_" + randomString + ".html");
+            file = new File("/home/igotechgh/nginx/html/files/html/reset_" + randomString + ".html");
             if(!file.exists()){
                 file.createNewFile();
             }
@@ -1583,7 +1666,7 @@
             fileWriter.flush();
             fileWriter.close();
 
-            String link ="http://182.160.16.251:81/files/html/reset_" + randomString + ".html";
+            String link ="https://igo.i-go.group/files/html/reset_" + randomString + ".html";
             TEmail tEmail = new TEmail();
             tEmail.setLink(link);
             tEmail.setUserId(driver.getId());
@@ -1649,8 +1732,7 @@
     @Override
     public Map<String, Object> queryPhone(Integer uid) throws Exception {
         Driver driver = this.selectById(uid);
-        Company company = companyMapper.selectById(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
-                driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
+        Company company = companyMapper.selectById(driver.getCompanyId());
         Map<String, Object> map = new HashMap<>();
         if(company.getType() == 3){//加盟商
             Phone phone = phoneMapper.queryInfo(company.getId(), 2);
@@ -1817,6 +1899,80 @@
         }
         return list;
     }
+    
+    
+    @Override
+    public List<ActivityWarpper> queryHistoryList(Integer uid, Date time, Integer language) throws Exception {
+        List<ActivityWarpper> list = new ArrayList<>();
+        Map<String, Date> date = dateUtil.getStartAndEndDate(time);
+        List<DriverActivityHistory> driverActivityHistories = driverActivityHistoryMapper.queryHistoryList(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(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(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(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()), driverActivityOnline.getType(), 0);
+                    Integer hour = 0;
+                    if(null != query){
+                        hour = Long.valueOf(query.getDuration() / 3600).intValue();
+                    }
+                    switch (driverActivityOnline.getType()){
+                        case 1:
+                            sb.append(language == 1 ? "打车" : language == 2 ? "ride" : "de course");
+                            break;
+                        case 2:
+                            sb.append("出租车");
+                            continue;
+                        case 3:
+                            sb.append("城际出行");
+                            continue;
+                        case 4:
+                            sb.append(language == 1 ? "包裹" : language == 2 ? "delivery" : "de livraison");
+                            break;
+                    }
+                    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(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.compareTo(driverActivityOrder.getOrderNum()) > 0 ? driverActivityOrder.getOrderNum() + "/" + driverActivityOrder.getOrderNum() : integer + "/" + driverActivityOrder.getOrderNum());
+                    break;
+            }
+            list.add(activityWarpper);
+        }
+        return list;
+    }
+    
 
 
     /**
@@ -1856,6 +2012,7 @@
             for(Map<String, Object> map : query){
                 for(Driver driver : drivers){
                     DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
+                    driverActivityHistory.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
                     driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
                     driverActivityHistory.setType(1);
                     driverActivityHistory.setDriverId(driver.getId());
@@ -1894,7 +2051,7 @@
                                     Element rewardToday_award = document1.getElementById("rewardToday_award");
                                     rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
                                     Element rewardToday_content = document1.getElementById("rewardToday_content");
-                                    rewardToday_content.text("邀请司机注册即可获得奖励。\n注意此活动是有时间限制的，详情请查看I-GO平台。");
+                                    rewardToday_content.html("邀请司机注册即可获得奖励。<br/>注意此活动是有时间限制的，详情请查看I-GO平台。");
                                 }
                                 if (2 == language) {
                                     document1.getElementById("chinese").remove();
@@ -1915,7 +2072,7 @@
                                     Element rewardToday1_award = document1.getElementById("rewardToday1_award");
                                     rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
                                     Element rewardToday1_content = document1.getElementById("rewardToday1_content");
-                                    rewardToday1_content.text("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.");
+                                    rewardToday1_content.html("Invite drivers to register to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
                                 }
                                 if (3 == language) {
                                     document1.getElementById("chinese").remove();
@@ -1936,16 +2093,16 @@
                                     Element rewardToday2_award = document1.getElementById("rewardToday2_award");
                                     rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
                                     Element rewardToday2_content = document1.getElementById("rewardToday2_content");
-                                    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.");
+                                    rewardToday2_content.html("Invitez les chauffeurs à s’inscrire pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
                                 }
                                 EmailUtil.send(driver.getEmail(), language == 1 ? "邀请司机奖励（活动）" : language == 2 ? "Invite drivers and earn" : "Invitez des chauffeurs et gagnez de l’argent", document1.html());
                                 String randomString = ToolUtil.getRandomString(10);
                                 //开始生成pdf收据和html收据
-                                File file = new File("/usr/local/nginx/html/files/html/");
+                                File file = new File("/home/igotechgh/nginx/html/files/html/");
                                 if(!file.exists()){
                                     file.mkdirs();
                                 }
-                                file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html");
+                                file = new File("/home/igotechgh/nginx/html/files/html/activity_" + randomString + ".html");
                                 if(!file.exists()){
                                     file.createNewFile();
                                 }
@@ -1954,7 +2111,7 @@
                                 fileWriter.flush();
                                 fileWriter.close();
     
-                                String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
+                                String link ="https://igo.i-go.group/files/html/activity_" + randomString + ".html";
                                 TEmail tEmail = new TEmail();
                                 tEmail.setLink(link);
                                 tEmail.setUserId(driver.getId());
@@ -1983,6 +2140,7 @@
             for(Map<String, Object> map : query){
                 for(Driver driver : drivers){
                     DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
+                    driverActivityHistory.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
                     driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
                     driverActivityHistory.setType(2);
                     driverActivityHistory.setDriverId(driver.getId());
@@ -2016,7 +2174,7 @@
                                     Element rewardToday_award = document1.getElementById("rewardToday_award");
                                     rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
                                     Element rewardToday_content = document1.getElementById("rewardToday_content");
-                                    rewardToday_content.text("邀请用户注册即可获得奖励。\n 注意此活动是有时间限制的，详情请查看I-GO平台。");
+                                    rewardToday_content.html("邀请用户注册即可获得奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
                                 }
                                 if (2 == language) {
                                     document1.getElementById("chinese").remove();
@@ -2037,7 +2195,7 @@
                                     Element rewardToday1_award = document1.getElementById("rewardToday1_award");
                                     rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
                                     Element rewardToday1_content = document1.getElementById("rewardToday1_content");
-                                    rewardToday1_content.text("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.");
+                                    rewardToday1_content.html("Invite users to register to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
                                 }
                                 if (3 == language) {
                                     document1.getElementById("chinese").remove();
@@ -2058,16 +2216,16 @@
                                     Element rewardToday2_award = document1.getElementById("rewardToday2_award");
                                     rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
                                     Element rewardToday2_content = document1.getElementById("rewardToday2_content");
-                                    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.");
+                                    rewardToday2_content.html("Invitez les utilisateurs à s’inscrire pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
                                 }
                                 EmailUtil.send(driver.getEmail(), language == 1 ? "邀请用户奖励(活动)" : language == 2 ? "Invite users and earn" : "Invitez des utilisateurs et gagnez de l’argent", document1.html());
                                 String randomString = ToolUtil.getRandomString(10);
                                 //开始生成pdf收据和html收据
-                                File file = new File("/usr/local/nginx/html/files/html/");
+                                File file = new File("/home/igotechgh/nginx/html/files/html/");
                                 if(!file.exists()){
                                     file.mkdirs();
                                 }
-                                file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html");
+                                file = new File("/home/igotechgh/nginx/html/files/html/activity_" + randomString + ".html");
                                 if(!file.exists()){
                                     file.createNewFile();
                                 }
@@ -2076,7 +2234,7 @@
                                 fileWriter.flush();
                                 fileWriter.close();
     
-                                String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
+                                String link ="https://igo.i-go.group/files/html/activity_" + randomString + ".html";
                                 TEmail tEmail = new TEmail();
                                 tEmail.setLink(link);
                                 tEmail.setUserId(driver.getId());
@@ -2106,6 +2264,7 @@
                 DriverActivityOnline driverActivityOnline = driverActivityOnlineMapper.selectById(Integer.valueOf(String.valueOf(map.get("id"))));
                 for(Driver driver : drivers){
                     DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
+                    driverActivityHistory.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
                     driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
                     driverActivityHistory.setType(3);
                     driverActivityHistory.setDriverId(driver.getId());
@@ -2139,7 +2298,7 @@
                                     Element rewardToday_award = document1.getElementById("rewardToday_award");
                                     rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
                                     Element rewardToday_content = document1.getElementById("rewardToday_content");
-                                    rewardToday_content.text("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。\n 注意此活动是有时间限制的，详情请查看I-GO平台。");
+                                    rewardToday_content.html("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
                                 }
                                 if (2 == language) {
                                     document1.getElementById("chinese").remove();
@@ -2160,7 +2319,7 @@
                                     Element rewardToday1_award = document1.getElementById("rewardToday1_award");
                                     rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
                                     Element rewardToday1_content = document1.getElementById("rewardToday1_content");
-                                    rewardToday1_content.text("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.");
+                                    rewardToday1_content.html("Stay online for " + driverActivityOnline.getOnline() + " hours to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
                                 }
                                 if (3 == language) {
                                     document1.getElementById("chinese").remove();
@@ -2181,16 +2340,16 @@
                                     Element rewardToday2_award = document1.getElementById("rewardToday2_award");
                                     rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
                                     Element rewardToday2_content = document1.getElementById("rewardToday2_content");
-                                    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.");
+                                    rewardToday2_content.html("Restez en ligne pendant " + driverActivityOnline.getOnline() + " heures pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
                                 }
                                 EmailUtil.send(driver.getEmail(), language == 1 ? "在线时长奖励（活动）" : language == 2 ? "Online-duration reward activity" : "Activité de récompense en ligne", document1.html());
                                 String randomString = ToolUtil.getRandomString(10);
                                 //开始生成pdf收据和html收据
-                                File file = new File("/usr/local/nginx/html/files/html/");
+                                File file = new File("/home/igotechgh/nginx/html/files/html/");
                                 if(!file.exists()){
                                     file.mkdirs();
                                 }
-                                file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html");
+                                file = new File("/home/igotechgh/nginx/html/files/html/activity_" + randomString + ".html");
                                 if(!file.exists()){
                                     file.createNewFile();
                                 }
@@ -2199,7 +2358,7 @@
                                 fileWriter.flush();
                                 fileWriter.close();
     
-                                String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
+                                String link ="https://igo.i-go.group/files/html/activity_" + randomString + ".html";
                                 TEmail tEmail = new TEmail();
                                 tEmail.setLink(link);
                                 tEmail.setUserId(driver.getId());
@@ -2229,6 +2388,7 @@
                 DriverActivityOrder driverActivityOrder = driverActivityOrderMapper.selectById(Integer.valueOf(String.valueOf(map.get("id"))));
                 for(Driver driver : drivers){
                     DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
+                    driverActivityHistory.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
                     driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
                     driverActivityHistory.setType(4);
                     driverActivityHistory.setDriverId(driver.getId());
@@ -2262,7 +2422,7 @@
                                     Element rewardToday_award = document1.getElementById("rewardToday_award");
                                     rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
                                     Element rewardToday_content = document1.getElementById("rewardToday_content");
-                                    rewardToday_content.text("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。\n 注意此活动是有时间限制的，详情请查看I-GO平台。");
+                                    rewardToday_content.html("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
                                 }
                                 if (2 == language) {
                                     document1.getElementById("chinese").remove();
@@ -2283,7 +2443,7 @@
                                     Element rewardToday1_award = document1.getElementById("rewardToday1_award");
                                     rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
                                     Element rewardToday1_content = document1.getElementById("rewardToday1_content");
-                                    rewardToday1_content.text("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.");
+                                    rewardToday1_content.html("Stay online and complete " + driverActivityOrder.getOrderNum() + " trips to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
                                 }
                                 if (3 == language) {
                                     document1.getElementById("chinese").remove();
@@ -2304,16 +2464,16 @@
                                     Element rewardToday2_award = document1.getElementById("rewardToday2_award");
                                     rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
                                     Element rewardToday2_content = document1.getElementById("rewardToday2_content");
-                                    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.");
+                                    rewardToday2_content.html("Restez en ligne et effectuez " + driverActivityOrder.getOrderNum() + " trajets pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
                                 }
                                 EmailUtil.send(driver.getEmail(), language == 1 ? "累计接单奖励（活动）" : language == 2 ? "Cumulative order activity" : "Activité cumulée des commandes", document1.html());
                                 String randomString = ToolUtil.getRandomString(10);
                                 //开始生成pdf收据和html收据
-                                File file = new File("/usr/local/nginx/html/files/html/");
+                                File file = new File("/home/igotechgh/nginx/html/files/html/");
                                 if(!file.exists()){
                                     file.mkdirs();
                                 }
-                                file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html");
+                                file = new File("/home/igotechgh/nginx/html/files/html/activity_" + randomString + ".html");
                                 if(!file.exists()){
                                     file.createNewFile();
                                 }
@@ -2322,7 +2482,7 @@
                                 fileWriter.flush();
                                 fileWriter.close();
     
-                                String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
+                                String link ="https://igo.i-go.group/files/html/activity_" + randomString + ".html";
                                 TEmail tEmail = new TEmail();
                                 tEmail.setLink(link);
                                 tEmail.setUserId(driver.getId());
@@ -2369,6 +2529,7 @@
             List<DriverOnline> driverOnlines = driverOnlineMapper.queryList(sdf.format(new Date()), null, dah.getDriverId(), duration);
             if(driverOnlines.size() > 0){
                 dah.setCarryOut(2);//完成状态
+                dah.setCompletionTime(new Date());
                 driverActivityHistoryMapper.updateById(dah);
     
                 redisUtil.remove("driverActivity_" + dah.getDriverId() + "_" + dah.getId());
@@ -2388,98 +2549,107 @@
     
                 Integer language = driver.getLanguage();
                 if(ToolUtil.isNotEmpty(driver.getEmail())) {
-                    String path1 = templatePath + "driver/index.html";
-                    Document document1 = Jsoup.parse(new File(path1), "UTF-8");
-                    if (1 == language) {
-                        document1.getElementById("english").remove();
-                        document1.getElementById("french").remove();
-                        document1.getElementById("invite").remove();
-                        document1.getElementById("user").remove();
-                        document1.getElementById("settle").remove();
-                        document1.getElementById("pass").remove();
-                        document1.getElementById("email").remove();
-                        document1.getElementById("bill").remove();
-                        document1.getElementById("rewardToday").remove();
-                        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() + "，请查收。\n详情请查看I-GO平台。");
-                    }
-                    if (2 == language) {
-                        document1.getElementById("chinese").remove();
-                        document1.getElementById("french").remove();
-                        document1.getElementById("invite1").remove();
-                        document1.getElementById("user1").remove();
-                        document1.getElementById("settle1").remove();
-                        document1.getElementById("pass1").remove();
-                        document1.getElementById("email1").remove();
-                        document1.getElementById("bill1").remove();
-                        document1.getElementById("rewardToday1").remove();
-                        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("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();
-                        document1.getElementById("english").remove();
-                        document1.getElementById("invite2").remove();
-                        document1.getElementById("user2").remove();
-                        document1.getElementById("settle2").remove();
-                        document1.getElementById("pass2").remove();
-                        document1.getElementById("email2").remove();
-                        document1.getElementById("bill2").remove();
-                        document1.getElementById("rewardToday2").remove();
-                        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("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
-                        Element reward2_content = document1.getElementById("reward2_content");
-                        reward2_content.text("Vous êtes resté en ligne pendant " + dao.getOnline() + " heures aujourd’hui et avez obtenu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.\nConsultez votre application pour plus de détails.");
-                    }
-                    EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
-                    String randomString = ToolUtil.getRandomString(10);
-                    //开始生成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/rewards_" + randomString + ".html");
-                    if(!file.exists()){
-                        file.createNewFile();
-                    }
-                    FileWriter fileWriter = new FileWriter(file);
-                    fileWriter.write(document1.html());
-                    fileWriter.flush();
-                    fileWriter.close();
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                String path1 = templatePath + "driver/index.html";
+                                Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+                                if (1 == language) {
+                                    document1.getElementById("english").remove();
+                                    document1.getElementById("french").remove();
+                                    document1.getElementById("invite").remove();
+                                    document1.getElementById("user").remove();
+                                    document1.getElementById("settle").remove();
+                                    document1.getElementById("pass").remove();
+                                    document1.getElementById("email").remove();
+                                    document1.getElementById("bill").remove();
+                                    document1.getElementById("rewardToday").remove();
+                                    document1.getElementById("driverAudit").remove();
+                                    document1.getElementById("carAudit").remove();
         
-                    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 ? "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);
+                                    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.html("今日累计在线" + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收。<br/>详情请查看I-GO平台。");
+                                }
+                                if (2 == language) {
+                                    document1.getElementById("chinese").remove();
+                                    document1.getElementById("french").remove();
+                                    document1.getElementById("invite1").remove();
+                                    document1.getElementById("user1").remove();
+                                    document1.getElementById("settle1").remove();
+                                    document1.getElementById("pass1").remove();
+                                    document1.getElementById("email1").remove();
+                                    document1.getElementById("bill1").remove();
+                                    document1.getElementById("rewardToday1").remove();
+                                    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.html("You stayed online for " + dao.getOnline() + " hours today, and got a bonus of GHS" + dah.getMoney() + ", please check.<br/>Check your app for more details.");
+                                }
+                                if (3 == language) {
+                                    document1.getElementById("chinese").remove();
+                                    document1.getElementById("english").remove();
+                                    document1.getElementById("invite2").remove();
+                                    document1.getElementById("user2").remove();
+                                    document1.getElementById("settle2").remove();
+                                    document1.getElementById("pass2").remove();
+                                    document1.getElementById("email2").remove();
+                                    document1.getElementById("bill2").remove();
+                                    document1.getElementById("rewardToday2").remove();
+                                    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("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
+                                    Element reward2_content = document1.getElementById("reward2_content");
+                                    reward2_content.html("Vous êtes resté en ligne pendant " + dao.getOnline() + " heures aujourd’hui et avez obtenu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails.");
+                                }
+                                EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
+                                String randomString = ToolUtil.getRandomString(10);
+                                //开始生成pdf收据和html收据
+                                File file = new File("/home/igotechgh/nginx/html/files/html/");
+                                if(!file.exists()){
+                                    file.mkdirs();
+                                }
+                                file = new File("/home/igotechgh/nginx/html/files/html/rewards_" + randomString + ".html");
+                                if(!file.exists()){
+                                    file.createNewFile();
+                                }
+                                FileWriter fileWriter = new FileWriter(file);
+                                fileWriter.write(document1.html());
+                                fileWriter.flush();
+                                fileWriter.close();
+    
+                                String link ="https://igo.i-go.group/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 ? "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);
+                            }catch (Exception e){
+                                e.printStackTrace();
+                            }
+                        }
+                    }).start();
                 }
             }
         }
@@ -2491,6 +2661,7 @@
             Integer integer = orderService.queryOrderNum(dah.getDriverId(), date.get("startTime"), date.get("endTime"));
             if(dao.getOrderNum() <= integer){
                 dah.setCarryOut(2);//完成状态
+                dah.setCompletionTime(new Date());
                 driverActivityHistoryMapper.updateById(dah);
                 //修改余额
                 Driver driver = this.selectById(dah.getDriverId());
@@ -2507,99 +2678,108 @@
     
                 Integer language = driver.getLanguage();
                 if(ToolUtil.isNotEmpty(driver.getEmail())) {
-                    String path1 = templatePath + "driver/index.html";
-                    Document document1 = Jsoup.parse(new File(path1), "UTF-8");
-                    if (1 == language) {
-                        document1.getElementById("english").remove();
-                        document1.getElementById("french").remove();
-                        document1.getElementById("invite").remove();
-                        document1.getElementById("user").remove();
-                        document1.getElementById("settle").remove();
-                        document1.getElementById("pass").remove();
-                        document1.getElementById("email").remove();
-                        document1.getElementById("bill").remove();
-                        document1.getElementById("rewardToday").remove();
-                        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() + "，请查收。\n详情请查看I-GO平台。");
-                    }
-                    if (2 == language) {
-                        document1.getElementById("chinese").remove();
-                        document1.getElementById("french").remove();
-                        document1.getElementById("invite1").remove();
-                        document1.getElementById("user1").remove();
-                        document1.getElementById("settle1").remove();
-                        document1.getElementById("pass1").remove();
-                        document1.getElementById("email1").remove();
-                        document1.getElementById("bill1").remove();
-                        document1.getElementById("rewardToday1").remove();
-                        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("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();
-                        document1.getElementById("english").remove();
-                        document1.getElementById("invite2").remove();
-                        document1.getElementById("user2").remove();
-                        document1.getElementById("settle2").remove();
-                        document1.getElementById("pass2").remove();
-                        document1.getElementById("email2").remove();
-                        document1.getElementById("bill2").remove();
-                        document1.getElementById("rewardToday2").remove();
-                        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("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
-                        Element reward2_content = document1.getElementById("reward2_content");
-                        reward2_content.text("Vous avez effectué " + dao.getOrderNum() + " trajets aujourd’hui et avez reçu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.\nConsultez votre application pour plus de détails.");
-                    }
-
-                    EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
-                    String randomString = ToolUtil.getRandomString(10);
-                    //开始生成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/rewards_" + randomString + ".html");
-                    if(!file.exists()){
-                        file.createNewFile();
-                    }
-                    FileWriter fileWriter = new FileWriter(file);
-                    fileWriter.write(document1.html());
-                    fileWriter.flush();
-                    fileWriter.close();
-
-                    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 ? "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);
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                String path1 = templatePath + "driver/index.html";
+                                Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+                                if (1 == language) {
+                                    document1.getElementById("english").remove();
+                                    document1.getElementById("french").remove();
+                                    document1.getElementById("invite").remove();
+                                    document1.getElementById("user").remove();
+                                    document1.getElementById("settle").remove();
+                                    document1.getElementById("pass").remove();
+                                    document1.getElementById("email").remove();
+                                    document1.getElementById("bill").remove();
+                                    document1.getElementById("rewardToday").remove();
+                                    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.html("今日累计接单" + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收。<br/>详情请查看I-GO平台。");
+                                }
+                                if (2 == language) {
+                                    document1.getElementById("chinese").remove();
+                                    document1.getElementById("french").remove();
+                                    document1.getElementById("invite1").remove();
+                                    document1.getElementById("user1").remove();
+                                    document1.getElementById("settle1").remove();
+                                    document1.getElementById("pass1").remove();
+                                    document1.getElementById("email1").remove();
+                                    document1.getElementById("bill1").remove();
+                                    document1.getElementById("rewardToday1").remove();
+                                    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.html("You completed " + dao.getOrderNum() + " trips today, and got a bonus of GHS" + dah.getMoney() + ", please check.<br/>Check your app for more details.");
+                                }
+                                if (3 == language) {
+                                    document1.getElementById("chinese").remove();
+                                    document1.getElementById("english").remove();
+                                    document1.getElementById("invite2").remove();
+                                    document1.getElementById("user2").remove();
+                                    document1.getElementById("settle2").remove();
+                                    document1.getElementById("pass2").remove();
+                                    document1.getElementById("email2").remove();
+                                    document1.getElementById("bill2").remove();
+                                    document1.getElementById("rewardToday2").remove();
+                                    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("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
+                                    Element reward2_content = document1.getElementById("reward2_content");
+                                    reward2_content.html("Vous avez effectué " + dao.getOrderNum() + " trajets aujourd’hui et avez reçu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails.");
+                                }
+    
+                                EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
+                                String randomString = ToolUtil.getRandomString(10);
+                                //开始生成pdf收据和html收据
+                                File file = new File("/home/igotechgh/nginx/html/files/html/");
+                                if(!file.exists()){
+                                    file.mkdirs();
+                                }
+                                file = new File("/home/igotechgh/nginx/html/files/html/rewards_" + randomString + ".html");
+                                if(!file.exists()){
+                                    file.createNewFile();
+                                }
+                                FileWriter fileWriter = new FileWriter(file);
+                                fileWriter.write(document1.html());
+                                fileWriter.flush();
+                                fileWriter.close();
+    
+                                String link ="https://igo.i-go.group/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 ? "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);
+                            }catch (Exception e){
+                                e.printStackTrace();
+                            }
+                        }
+                    }).start();
                 }
             }
         }
@@ -3094,13 +3274,15 @@
      * @throws Exception
      */
     @Override
-    public List<Driver> queryIdleDriver(Integer type, Integer serverCarModelId, Double lon, Double lat, Double distance, Integer companyId) throws Exception {
+    public List<Driver> queryIdleDriver(Integer userId, Integer type, Integer serverCarModelId, Double lon, Double lat, Double distance, Integer companyId) throws Exception {
         List<Driver> drivers = driverMapper.queryIdleDriver_(type, serverCarModelId, companyId);
+        System.err.println("派单查询的司机：" + JSON.toJSONString(drivers));
+        String tripId = redisUtil.getValue("trip" + userId);
         List<Driver> list = new ArrayList<>();
         for(Driver driver : drivers){
             String value = redisUtil.getValue("DRIVER" + driver.getId());
             if(ToolUtil.isNotEmpty(value)){
-                DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(lat, lon, Double.parseDouble(value.split(",")[1]), Double.parseDouble(value.split(",")[0]));
+                DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(lat, lon, Double.parseDouble(value.split(",")[1]), Double.parseDouble(value.split(",")[0]), tripId);
                 if(null != distancematrix){
                     if(distancematrix.getDistance() < (distance * 1000)){
                         list.add(driver);

--
Gitblit v1.7.1