修改bug

puzhibing

2023-08-03 6982ea4c0a5550b3c88670df87539a91287b115d

修改bug

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java

@@ -512,13 +512,13 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<HomeWarpper> queryHomeData(HttpServletRequest request){
    public ResultUtil<HomeWarpper> queryHomeData(Integer language, HttpServletRequest request){
        try {
            Integer uid = driverService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            Map<String, Object> map = driverService.queryHomeData(uid);
            Map<String, Object> map = driverService.queryHomeData(uid, language);
            return ResultUtil.success(HomeWarpper.getHomeWarpper(map));
        }catch (Exception e){
            e.printStackTrace();
@@ -1090,7 +1090,7 @@
                baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0)));
                switch (Integer.valueOf(String.valueOf(null != map.get("orderType") ? map.get("orderType") : 0))){
                    case 1:
                        baseWarpper.setName(language == 1 ? "专车" : language == 2 ? "Special car" : "véhicules");
                        baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
                        break;
                    case 2:
                        baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi");
@@ -1099,7 +1099,7 @@
                        baseWarpper.setName(language == 1 ? "城际出行" : language == 2 ? "Intercity travel" : "Mobilité entre villes");
                        break;
                    case 4:
                        baseWarpper.setName(language == 1 ? "市内小件物流" : language == 2 ? "Small parts logistics in the city" : "Logistique de petites pièces dans la ville");
                        baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison");
                        break;
                    case 5:
                        baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville");
@@ -1176,13 +1176,13 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<ActivityWarpper>> queryMyActivity(HttpServletRequest request){
    public ResultUtil<List<ActivityWarpper>> queryMyActivity(Integer language, HttpServletRequest request){
        try {
            Integer uid = driverService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            return ResultUtil.success(driverService.queryMyActivity(uid, new Date()));
            return ResultUtil.success(driverService.queryMyActivity(uid, new Date(), language));
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
@@ -1233,14 +1233,14 @@
            @ApiImplicitParam(value = "查询的给定日期", name = "time", required = true, dataType = "string"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil queryHistoryActivityInfo(String time, HttpServletRequest request){
    public ResultUtil queryHistoryActivityInfo(String time, Integer language, HttpServletRequest request){
        try {
            Integer uid = driverService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
            List<ActivityWarpper> activityWarppers = driverService.queryMyActivity(uid, sdf.parse(time));
            List<ActivityWarpper> activityWarppers = driverService.queryMyActivity(uid, sdf.parse(time), language);
            return ResultUtil.success(activityWarppers);
        }catch (Exception e){
            e.printStackTrace();

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml

@@ -75,7 +75,7 @@
        select
        a.id as id,
        a.state as orderState,
        if(#{language} = 1, '市内小件物流订单', if(#{language} = 2, 'Small parts logistics orders in the city', 'Commandes logistiques de petites pièces dans la ville')) as orderName,
        if(#{language} = 1, '包裹', if(#{language} = 2, 'Package', 'Livraison')) as orderName,
        DATE_FORMAT(a.travelTime, '%m月%d日 %H:%i') as travelTime,
        a.startAddress as startAddress,
        a.endAddress as endAddress,
@@ -144,7 +144,7 @@
        select
        id as id,
        type as type,
        if(#{language} = 1, '市内小件物流订单', if(#{language} = 2, 'Small parts logistics orders in the city', 'Commandes logistiques de petites pièces dans la ville')) as `name`,
        if(#{language} = 1, '包裹', if(#{language} = 2, 'Package', 'Livraison')) as `name`,
        DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as `time`,
        startAddress as startAddress,
        endAddress as endAddress,
@@ -165,7 +165,7 @@
        select
        id as id,
        type as type,
        if(#{language} = 1, '市内小件物流订单', if(#{language} = 2, 'Small parts logistics orders in the city', 'Commandes logistiques de petites pièces dans la ville')) as `name`,
        if(#{language} = 1, '包裹', if(#{language} = 2, 'Package', 'Livraison')) as `name`,
        DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
        startAddress as startAddress,
        endAddress as endAddress,

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java

@@ -179,7 +179,7 @@
            }
        }).start();

        systemNoticeService.addSystemNotice(2, "您已成功抢得小件物流订单，请及时联系客户！", orderLogistics.getDriverId());
        systemNoticeService.addSystemNotice(2, "您已成功抢得包裹订单，请及时联系客户！", orderLogistics.getDriverId());
        systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getLastName().substring(0, 1) + "师傅，请保持电话畅通！", orderLogistics.getUserId());

        return ResultUtil.success();
@@ -423,17 +423,17 @@
            String path = templatePath + "index.html";
            Document document = Jsoup.parse(new File(path), "UTF-8");
            if(1 == language){
                document.getElementById("english").attr("style", "display: none;");
                document.getElementById("french").attr("style", "display: none;");
                document.getElementById("invite").attr("style", "display: none;");
                document.getElementById("user").attr("style", "display: none;");
                document.getElementById("settle").attr("style", "display: none;");
                document.getElementById("pass").attr("style", "display: none;");
                document.getElementById("bill").attr("style", "display: none;");
                document.getElementById("reward").attr("style", "display: none;");
                document.getElementById("rewardToday").attr("style", "display: none;");
                document.getElementById("driverAudit").attr("style", "display: none;");
                document.getElementById("carAudit").attr("style", "display: none;");
                document.getElementById("english").remove();
                document.getElementById("french").remove();
                document.getElementById("invite").remove();
                document.getElementById("user").remove();
                document.getElementById("settle").remove();
                document.getElementById("pass").remove();
                document.getElementById("bill").remove();
                document.getElementById("reward").remove();
                document.getElementById("rewardToday").remove();
                document.getElementById("driverAudit").remove();
                document.getElementById("carAudit").remove();

                Element email_user = document.getElementById("email_user");
                email_user.text("您好 ，");
@@ -441,17 +441,17 @@
                email_content.text("邮件取件码是：" + random + "，请在5分钟内完成验证");
            }
            if(2 == language){
                document.getElementById("chinese").attr("style", "display: none;");
                document.getElementById("french").attr("style", "display: none;");
                document.getElementById("invite1").attr("style", "display: none;");
                document.getElementById("user1").attr("style", "display: none;");
                document.getElementById("settle1").attr("style", "display: none;");
                document.getElementById("pass1").attr("style", "display: none;");
                document.getElementById("bill1").attr("style", "display: none;");
                document.getElementById("reward1").attr("style", "display: none;");
                document.getElementById("rewardToday1").attr("style", "display: none;");
                document.getElementById("driverAudit1").attr("style", "display: none;");
                document.getElementById("carAudit1").attr("style", "display: none;");
                document.getElementById("chinese").remove();
                document.getElementById("french").remove();
                document.getElementById("invite1").remove();
                document.getElementById("user1").remove();
                document.getElementById("settle1").remove();
                document.getElementById("pass1").remove();
                document.getElementById("bill1").remove();
                document.getElementById("reward1").remove();
                document.getElementById("rewardToday1").remove();
                document.getElementById("driverAudit1").remove();
                document.getElementById("carAudit1").remove();

                Element email1_user = document.getElementById("email1_user");
                email1_user.text("Hello ，");
@@ -459,17 +459,17 @@
                email1_content.text("pickup code is " + random + ", please complete the verification within 5 minutes. If the request wasn't made by you, please ignore this email.");
            }
            if(3 == language){
                document.getElementById("chinese").attr("style", "display: none;");
                document.getElementById("english").attr("style", "display: none;");
                document.getElementById("invite2").attr("style", "display: none;");
                document.getElementById("user2").attr("style", "display: none;");
                document.getElementById("settle2").attr("style", "display: none;");
                document.getElementById("pass2").attr("style", "display: none;");
                document.getElementById("bill2").attr("style", "display: none;");
                document.getElementById("reward2").attr("style", "display: none;");
                document.getElementById("rewardToday2").attr("style", "display: none;");
                document.getElementById("driverAudit2").attr("style", "display: none;");
                document.getElementById("carAudit2").attr("style", "display: none;");
                document.getElementById("chinese").remove();
                document.getElementById("english").remove();
                document.getElementById("invite2").remove();
                document.getElementById("user2").remove();
                document.getElementById("settle2").remove();
                document.getElementById("pass2").remove();
                document.getElementById("bill2").remove();
                document.getElementById("reward2").remove();
                document.getElementById("rewardToday2").remove();
                document.getElementById("driverAudit2").remove();
                document.getElementById("carAudit2").remove();

                Element email2_user = document.getElementById("email2_user");
                email2_user.text("Bonjour ，");

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml

@@ -98,7 +98,7 @@
            select
            id as id,
            (1) as type,
            if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as `name`,
            if(#{language} = 1, '打车', if(#{language} = 2 , 'Ride', 'Course')) as `name`,
            DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
            startAddress as startAddress,
            endAddress as endAddress,
@@ -116,7 +116,7 @@
            select
            id as id,
            (1) as type,
            if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as `name`,
            if(#{language} = 1, '打车', if(#{language} = 2 , 'Ride', 'Course')) as `name`,
            DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
            startAddress as startAddress,
            endAddress as endAddress,
@@ -133,7 +133,7 @@
            select
            id as id,
            (1) as type,
            if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as `name`,
            if(#{language} = 1, '打车', if(#{language} = 2 , 'Ride', 'Course')) as `name`,
            DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
            startAddress as startAddress,
            endAddress as endAddress,
@@ -155,7 +155,7 @@
        select
        id as id,
        (1) as type,
        if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as `name`,
        if(#{language} = 1, '打车', if(#{language} = 2 , 'Ride', 'Course')) as `name`,
        DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
        startAddress as startAddress,
        endAddress as endAddress,
@@ -171,7 +171,7 @@
            and state != 1
        </if>
        <if test="state == 2">
            and state = 7
            and (state = 7 or driverPay = 1)
        </if>
        <if test="state == 3">
            and state = 10
@@ -188,7 +188,7 @@
        select
        id as orderId,
        state as orderState,
        if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as orderName,
        if(#{language} = 1, '打车', if(#{language} = 2 , 'Ride', 'Course')) as orderName,
        DATE_FORMAT(travelTime, '%m-%d %H:%i') as travelTime,
        startAddress as startAddress,
        endAddress as endAddress,

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -221,7 +221,7 @@
            }
        }).start();

        systemNoticeService.addSystemNotice(2, "您已成功抢得专车订单，请及时联系客户！", orderPrivateCar.getDriverId());
        systemNoticeService.addSystemNotice(2, "您已成功抢得打车订单，请及时联系客户！", orderPrivateCar.getDriverId());
        systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getLastName().substring(0, 1) + "师傅，请保持电话畅通！", orderPrivateCar.getUserId());
        return ResultUtil.success();
    }

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/KaptchaController.java

@@ -2,6 +2,8 @@

import com.google.code.kaptcha.Constants;
import com.google.code.kaptcha.Producer;
import com.google.code.kaptcha.impl.DefaultKaptcha;
import com.google.code.kaptcha.util.Config;
import com.stylefeng.guns.config.properties.GunsProperties;
import com.stylefeng.guns.core.util.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +18,7 @@
import javax.servlet.http.HttpSession;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.Properties;

/**
 * 验证码生成
@@ -61,7 +64,30 @@
        session.setAttribute(Constants.KAPTCHA_SESSION_KEY, capText);

        // create the image with the text
        BufferedImage bi = producer.createImage(capText);
        Properties properties = new Properties();
        // 设置边框
        properties.setProperty("kaptcha.border", "no");
        // 设置颜色
        properties.setProperty("kaptcha.border.color", "105,179,90");
        // 设置字体颜色
        properties.setProperty("kaptcha.textproducer.font.color", "blue");
        // 设置宽度
        properties.setProperty("kaptcha.image.width", "125");
        // 高度
        properties.setProperty("kaptcha.image.height", "42");
        // 设置session.key
        properties.setProperty("kaptcha.session.key", "code");
        // 设置文本长度
        properties.setProperty("kaptcha.textproducer.char.length", "4");
        // 设置字体
        properties.setProperty("kaptcha.textproducer.font.names", "宋体,楷体,微软雅黑");
        //字体大小
        properties.setProperty("kaptcha.textproducer.font.size", "35");

        Config config = new Config(properties);
        DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
        defaultKaptcha.setConfig(config);
        BufferedImage bi = defaultKaptcha.createImage(capText);
        ServletOutputStream out = null;
        try {
            out = response.getOutputStream();

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml

@@ -55,7 +55,7 @@
        select
        (money * -1) as money,
        DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
        CONCAT(if(orderType = 1, '专车', if(orderType = 2, '出租车', if(orderType = 3, '跨城', if(orderType = 4, '市内小件物流', if(orderType = 5, '跨城小件物流', '包车'))))), '订单取消') as name,
        CONCAT(if(orderType = 1, '打车', if(orderType = 2, '出租车', if(orderType = 3, '跨城', if(orderType = 4, '包裹', if(orderType = 5, '跨城小件物流', '包车'))))), '订单取消') as name,
        UNIX_TIMESTAMP(insertTime) as insertTime
        from t_order_cancel where state = 2 and userType = 1 and money is not null and userId = #{uid}
        <choose>

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java

@@ -115,7 +115,7 @@
     * @return
     * @throws Exception
     */
    Map<String, Object> queryHomeData(Integer uid) throws Exception;
    Map<String, Object> queryHomeData(Integer uid, Integer language) throws Exception;


    /**
@@ -269,7 +269,7 @@
     * @return
     * @throws Exception
     */
    List<ActivityWarpper> queryMyActivity(Integer uid, Date time) throws Exception;
    List<ActivityWarpper> queryMyActivity(Integer uid, Date time, Integer language) throws Exception;


    /**

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java

@@ -205,17 +205,17 @@
        String path = templatePath + "index.html";
        Document document = Jsoup.parse(new File(path), "UTF-8");
        if(1 == language){
            document.getElementById("english").attr("style", "display: none;");
            document.getElementById("french").attr("style", "display: none;");
            document.getElementById("invite").attr("style", "display: none;");
            document.getElementById("user").attr("style", "display: none;");
            document.getElementById("settle").attr("style", "display: none;");
            document.getElementById("pass").attr("style", "display: none;");
            document.getElementById("bill").attr("style", "display: none;");
            document.getElementById("reward").attr("style", "display: none;");
            document.getElementById("rewardToday").attr("style", "display: none;");
            document.getElementById("driverAudit").attr("style", "display: none;");
            document.getElementById("carAudit").attr("style", "display: none;");
            document.getElementById("english").remove();
            document.getElementById("french").remove();
            document.getElementById("invite").remove();
            document.getElementById("user").remove();
            document.getElementById("settle").remove();
            document.getElementById("pass").remove();
            document.getElementById("bill").remove();
            document.getElementById("reward").remove();
            document.getElementById("rewardToday").remove();
            document.getElementById("driverAudit").remove();
            document.getElementById("carAudit").remove();

            Element email_user = document.getElementById("email_user");
            email_user.text("您好 ，");
@@ -223,17 +223,17 @@
            email_content.text("邮件验证码是：" + authCode + "，请在5分钟内完成验证");
        }
        if(2 == language){
            document.getElementById("chinese").attr("style", "display: none;");
            document.getElementById("french").attr("style", "display: none;");
            document.getElementById("invite1").attr("style", "display: none;");
            document.getElementById("user1").attr("style", "display: none;");
            document.getElementById("settle1").attr("style", "display: none;");
            document.getElementById("pass1").attr("style", "display: none;");
            document.getElementById("bill1").attr("style", "display: none;");
            document.getElementById("reward1").attr("style", "display: none;");
            document.getElementById("rewardToday1").attr("style", "display: none;");
            document.getElementById("driverAudit1").attr("style", "display: none;");
            document.getElementById("carAudit1").attr("style", "display: none;");
            document.getElementById("chinese").remove();
            document.getElementById("french").remove();
            document.getElementById("invite1").remove();
            document.getElementById("user1").remove();
            document.getElementById("settle1").remove();
            document.getElementById("pass1").remove();
            document.getElementById("bill1").remove();
            document.getElementById("reward1").remove();
            document.getElementById("rewardToday1").remove();
            document.getElementById("driverAudit1").remove();
            document.getElementById("carAudit1").remove();

            Element email1_user = document.getElementById("email1_user");
            email1_user.text("Hello ，");
@@ -241,17 +241,17 @@
            email1_content.text("verification code is " + authCode + ", please complete the verification within 5 minutes. If the request wasn't made by you, please ignore this email.");
        }
        if(3 == language){
            document.getElementById("chinese").attr("style", "display: none;");
            document.getElementById("english").attr("style", "display: none;");
            document.getElementById("invite2").attr("style", "display: none;");
            document.getElementById("user2").attr("style", "display: none;");
            document.getElementById("settle2").attr("style", "display: none;");
            document.getElementById("pass2").attr("style", "display: none;");
            document.getElementById("bill2").attr("style", "display: none;");
            document.getElementById("reward2").attr("style", "display: none;");
            document.getElementById("rewardToday2").attr("style", "display: none;");
            document.getElementById("driverAudit2").attr("style", "display: none;");
            document.getElementById("carAudit2").attr("style", "display: none;");
            document.getElementById("chinese").remove();
            document.getElementById("english").remove();
            document.getElementById("invite2").remove();
            document.getElementById("user2").remove();
            document.getElementById("settle2").remove();
            document.getElementById("pass2").remove();
            document.getElementById("bill2").remove();
            document.getElementById("reward2").remove();
            document.getElementById("rewardToday2").remove();
            document.getElementById("driverAudit2").remove();
            document.getElementById("carAudit2").remove();

            Element email2_user = document.getElementById("email2_user");
            email2_user.text("Hello ，");
@@ -311,17 +311,17 @@
                    String path = templatePath + "index.html";
                    Document document = Jsoup.parse(new File(path), "UTF-8");
                    if(1 == language){
                        document.getElementById("english").attr("style", "display: none;");
                        document.getElementById("french").attr("style", "display: none;");
                        document.getElementById("user").attr("style", "display: none;");
                        document.getElementById("settle").attr("style", "display: none;");
                        document.getElementById("pass").attr("style", "display: none;");
                        document.getElementById("email").attr("style", "display: none;");
                        document.getElementById("bill").attr("style", "display: none;");
                        document.getElementById("reward").attr("style", "display: none;");
                        document.getElementById("rewardToday").attr("style", "display: none;");
                        document.getElementById("driverAudit").attr("style", "display: none;");
                        document.getElementById("carAudit").attr("style", "display: none;");
                        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();

                        Element invite_user = document.getElementById("invite_user");
                        invite_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -329,17 +329,17 @@
                        invite_content.text("您已成功邀请一位司机注册I-GO，获得奖励GHS " + bigDecimal.doubleValue() + "，请查收");
                    }
                    if(2 == language){
                        document.getElementById("chinese").attr("style", "display: none;");
                        document.getElementById("french").attr("style", "display: none;");
                        document.getElementById("user1").attr("style", "display: none;");
                        document.getElementById("settle1").attr("style", "display: none;");
                        document.getElementById("pass1").attr("style", "display: none;");
                        document.getElementById("email1").attr("style", "display: none;");
                        document.getElementById("bill1").attr("style", "display: none;");
                        document.getElementById("reward1").attr("style", "display: none;");
                        document.getElementById("rewardToday1").attr("style", "display: none;");
                        document.getElementById("driverAudit1").attr("style", "display: none;");
                        document.getElementById("carAudit1").attr("style", "display: none;");
                        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();

                        Element invite1_user = document.getElementById("invite1_user");
                        invite1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -347,17 +347,17 @@
                        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").attr("style", "display: none;");
                        document.getElementById("english").attr("style", "display: none;");
                        document.getElementById("user2").attr("style", "display: none;");
                        document.getElementById("settle2").attr("style", "display: none;");
                        document.getElementById("pass2").attr("style", "display: none;");
                        document.getElementById("email2").attr("style", "display: none;");
                        document.getElementById("bill2").attr("style", "display: none;");
                        document.getElementById("reward2").attr("style", "display: none;");
                        document.getElementById("rewardToday2").attr("style", "display: none;");
                        document.getElementById("driverAudit2").attr("style", "display: none;");
                        document.getElementById("carAudit2").attr("style", "display: none;");
                        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();

                        Element invite2_user = document.getElementById("invite2_user");
                        invite2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -488,7 +488,7 @@
        String[] city = new String[]{city1.getEnglishName()};
        Company query = companyCityService.query(city);
        if(null == query){
            return ResultUtil.error(language == 1 ? "车牌号已经使用" : language == 2 ? "" : "选择从业地暂未开通业务");
            return ResultUtil.error(language == 1 ? "选择从业地暂未开通业务" : language == 2 ? "The selected place of employment has not yet opened business" : "Choisir un lieu de pratique pas encore ouvert");
        }
        if(null != query){
            switch (query.getType()){
@@ -549,49 +549,49 @@
            String path1 = templatePath + "index.html";
            Document document1 = Jsoup.parse(new File(path1), "UTF-8");
            if(1 == language){
                document1.getElementById("english").attr("style", "display: none;");
                document1.getElementById("french").attr("style", "display: none;");
                document1.getElementById("invite").attr("style", "display: none;");
                document1.getElementById("user").attr("style", "display: none;");
                document1.getElementById("pass").attr("style", "display: none;");
                document1.getElementById("email").attr("style", "display: none;");
                document1.getElementById("bill").attr("style", "display: none;");
                document1.getElementById("reward").attr("style", "display: none;");
                document1.getElementById("rewardToday").attr("style", "display: none;");
                document1.getElementById("driverAudit").attr("style", "display: none;");
                document1.getElementById("carAudit").attr("style", "display: none;");
                document1.getElementById("english").remove();
                document1.getElementById("french").remove();
                document1.getElementById("invite").remove();
                document1.getElementById("user").remove();
                document1.getElementById("pass").remove();
                document1.getElementById("email").remove();
                document1.getElementById("bill").remove();
                document1.getElementById("reward").remove();
                document1.getElementById("rewardToday").remove();
                document1.getElementById("driverAudit").remove();
                document1.getElementById("carAudit").remove();

                Element settle_user = document1.getElementById("settle_user");
                settle_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
            }
            if(2 == language){
                document1.getElementById("chinese").attr("style", "display: none;");
                document1.getElementById("french").attr("style", "display: none;");
                document1.getElementById("invite1").attr("style", "display: none;");
                document1.getElementById("user1").attr("style", "display: none;");
                document1.getElementById("pass1").attr("style", "display: none;");
                document1.getElementById("email1").attr("style", "display: none;");
                document1.getElementById("bill1").attr("style", "display: none;");
                document1.getElementById("reward1").attr("style", "display: none;");
                document1.getElementById("rewardToday1").attr("style", "display: none;");
                document1.getElementById("driverAudit1").attr("style", "display: none;");
                document1.getElementById("carAudit1").attr("style", "display: none;");
                document1.getElementById("chinese").remove();
                document1.getElementById("french").remove();
                document1.getElementById("invite1").remove();
                document1.getElementById("user1").remove();
                document1.getElementById("pass1").remove();
                document1.getElementById("email1").remove();
                document1.getElementById("bill1").remove();
                document1.getElementById("reward1").remove();
                document1.getElementById("rewardToday1").remove();
                document1.getElementById("driverAudit1").remove();
                document1.getElementById("carAudit1").remove();

                Element settle1_user = document1.getElementById("settle1_user");
                settle1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
            }
            if(3 == language){
                document1.getElementById("chinese").attr("style", "display: none;");
                document1.getElementById("english").attr("style", "display: none;");
                document1.getElementById("invite2").attr("style", "display: none;");
                document1.getElementById("user2").attr("style", "display: none;");
                document1.getElementById("pass2").attr("style", "display: none;");
                document1.getElementById("email2").attr("style", "display: none;");
                document1.getElementById("bill2").attr("style", "display: none;");
                document1.getElementById("reward2").attr("style", "display: none;");
                document1.getElementById("rewardToday2").attr("style", "display: none;");
                document1.getElementById("driverAudit2").attr("style", "display: none;");
                document1.getElementById("carAudit2").attr("style", "display: none;");
                document1.getElementById("chinese").remove();
                document1.getElementById("english").remove();
                document1.getElementById("invite2").remove();
                document1.getElementById("user2").remove();
                document1.getElementById("pass2").remove();
                document1.getElementById("email2").remove();
                document1.getElementById("bill2").remove();
                document1.getElementById("reward2").remove();
                document1.getElementById("rewardToday2").remove();
                document1.getElementById("driverAudit2").remove();
                document1.getElementById("carAudit2").remove();

                Element settle2_user = document1.getElementById("settle2_user");
                settle2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -628,49 +628,49 @@
            String path1 = templatePath + "index.html";
            Document document1 = Jsoup.parse(new File(path1), "UTF-8");
            if(1 == language){
                document1.getElementById("english").attr("style", "display: none;");
                document1.getElementById("french").attr("style", "display: none;");
                document1.getElementById("invite").attr("style", "display: none;");
                document1.getElementById("user").attr("style", "display: none;");
                document1.getElementById("settle").attr("style", "display: none;");
                document1.getElementById("email").attr("style", "display: none;");
                document1.getElementById("bill").attr("style", "display: none;");
                document1.getElementById("reward").attr("style", "display: none;");
                document1.getElementById("rewardToday").attr("style", "display: none;");
                document1.getElementById("driverAudit").attr("style", "display: none;");
                document1.getElementById("carAudit").attr("style", "display: none;");
                document1.getElementById("english").remove();
                document1.getElementById("french").remove();
                document1.getElementById("invite").remove();
                document1.getElementById("user").remove();
                document1.getElementById("settle").remove();
                document1.getElementById("email").remove();
                document1.getElementById("bill").remove();
                document1.getElementById("reward").remove();
                document1.getElementById("rewardToday").remove();
                document1.getElementById("driverAudit").remove();
                document1.getElementById("carAudit").remove();

                Element pass_user = document1.getElementById("pass_user");
                pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
            }
            if(2 == language){
                document1.getElementById("chinese").attr("style", "display: none;");
                document1.getElementById("french").attr("style", "display: none;");
                document1.getElementById("invite1").attr("style", "display: none;");
                document1.getElementById("user1").attr("style", "display: none;");
                document1.getElementById("settle1").attr("style", "display: none;");
                document1.getElementById("email1").attr("style", "display: none;");
                document1.getElementById("bill1").attr("style", "display: none;");
                document1.getElementById("reward1").attr("style", "display: none;");
                document1.getElementById("rewardToday1").attr("style", "display: none;");
                document1.getElementById("driverAudit1").attr("style", "display: none;");
                document1.getElementById("carAudit1").attr("style", "display: none;");
                document1.getElementById("chinese").remove();
                document1.getElementById("french").remove();
                document1.getElementById("invite1").remove();
                document1.getElementById("user1").remove();
                document1.getElementById("settle1").remove();
                document1.getElementById("email1").remove();
                document1.getElementById("bill1").remove();
                document1.getElementById("reward1").remove();
                document1.getElementById("rewardToday1").remove();
                document1.getElementById("driverAudit1").remove();
                document1.getElementById("carAudit1").remove();

                Element pass1_user = document1.getElementById("pass1_user");
                pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
            }
            if(3 == language){
                document1.getElementById("chinese").attr("style", "display: none;");
                document1.getElementById("english").attr("style", "display: none;");
                document1.getElementById("invite2").attr("style", "display: none;");
                document1.getElementById("user2").attr("style", "display: none;");
                document1.getElementById("settle2").attr("style", "display: none;");
                document1.getElementById("email2").attr("style", "display: none;");
                document1.getElementById("bill2").attr("style", "display: none;");
                document1.getElementById("reward2").attr("style", "display: none;");
                document1.getElementById("rewardToday2").attr("style", "display: none;");
                document1.getElementById("driverAudit2").attr("style", "display: none;");
                document1.getElementById("carAudit2").attr("style", "display: none;");
                document1.getElementById("chinese").remove();
                document1.getElementById("english").remove();
                document1.getElementById("invite2").remove();
                document1.getElementById("user2").remove();
                document1.getElementById("settle2").remove();
                document1.getElementById("email2").remove();
                document1.getElementById("bill2").remove();
                document1.getElementById("reward2").remove();
                document1.getElementById("rewardToday2").remove();
                document1.getElementById("driverAudit2").remove();
                document1.getElementById("carAudit2").remove();

                Element pass2_user = document1.getElementById("pass2_user");
                pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -766,9 +766,9 @@
     * @throws Exception
     */
    @Override
    public Map<String, Object> queryHomeData(Integer uid) throws Exception {
    public Map<String, Object> queryHomeData(Integer uid, Integer language) throws Exception {
        Map<String, Object> map = driverMapper.queryHomeData(uid);
        int size = this.queryMyActivity(uid, new Date()).size();
        int size = this.queryMyActivity(uid, new Date(), language).size();
        map.put("activity", size);
        //获取司机待支付的现金支付订单推送司机支付
        new Thread(new Runnable() {
@@ -962,7 +962,7 @@
        map.put("reservation", list.size());//预约
        List<Map<String, Object>> list1 = orderLogisticsService.queryOrderList(uid, language);
        map.put("small", list1.size());//小件
        int size = this.queryMyActivity(uid, new Date()).size();
        int size = this.queryMyActivity(uid, new Date(), language).size();
        map.put("activity", size);//活动
        return map;
    }
@@ -983,7 +983,7 @@
            baseWarpper.setId(d.getType());
            switch (d.getType()){
                case 1:
                    baseWarpper.setName(language == 1 ? "专车" : language == 2 ? "Special car" : "véhicules");
                    baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course ");
                    break;
                case 2:
                    baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi");
@@ -992,7 +992,7 @@
                    baseWarpper.setName(language == 1 ? "跨城出行" : language == 2 ? "Cross-town travel" : "Se déplacer à travers la ville");
                    break;
                case 4:
                    baseWarpper.setName(language == 1 ? "市内小件物流" : language == 2 ? "Small parts logistics in the city" : "Logistique de petites pièces dans la ville");
                    baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
                    break;
                case 5:
                    baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville");
@@ -1095,49 +1095,49 @@
            String path1 = templatePath + "index.html";
            Document document1 = Jsoup.parse(new File(path1), "UTF-8");
            if(1 == language){
                document1.getElementById("english").attr("style", "display: none;");
                document1.getElementById("french").attr("style", "display: none;");
                document1.getElementById("invite").attr("style", "display: none;");
                document1.getElementById("user").attr("style", "display: none;");
                document1.getElementById("settle").attr("style", "display: none;");
                document1.getElementById("email").attr("style", "display: none;");
                document1.getElementById("bill").attr("style", "display: none;");
                document1.getElementById("reward").attr("style", "display: none;");
                document1.getElementById("rewardToday").attr("style", "display: none;");
                document1.getElementById("driverAudit").attr("style", "display: none;");
                document1.getElementById("carAudit").attr("style", "display: none;");
                document1.getElementById("english").remove();
                document1.getElementById("french").remove();
                document1.getElementById("invite").remove();
                document1.getElementById("user").remove();
                document1.getElementById("settle").remove();
                document1.getElementById("email").remove();
                document1.getElementById("bill").remove();
                document1.getElementById("reward").remove();
                document1.getElementById("rewardToday").remove();
                document1.getElementById("driverAudit").remove();
                document1.getElementById("carAudit").remove();

                Element pass_user = document1.getElementById("pass_user");
                pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
            }
            if(2 == language){
                document1.getElementById("chinese").attr("style", "display: none;");
                document1.getElementById("french").attr("style", "display: none;");
                document1.getElementById("invite1").attr("style", "display: none;");
                document1.getElementById("user1").attr("style", "display: none;");
                document1.getElementById("settle1").attr("style", "display: none;");
                document1.getElementById("email1").attr("style", "display: none;");
                document1.getElementById("bill1").attr("style", "display: none;");
                document1.getElementById("reward1").attr("style", "display: none;");
                document1.getElementById("rewardToday1").attr("style", "display: none;");
                document1.getElementById("driverAudit1").attr("style", "display: none;");
                document1.getElementById("carAudit1").attr("style", "display: none;");
                document1.getElementById("chinese").remove();
                document1.getElementById("french").remove();
                document1.getElementById("invite1").remove();
                document1.getElementById("user1").remove();
                document1.getElementById("settle1").remove();
                document1.getElementById("email1").remove();
                document1.getElementById("bill1").remove();
                document1.getElementById("reward1").remove();
                document1.getElementById("rewardToday1").remove();
                document1.getElementById("driverAudit1").remove();
                document1.getElementById("carAudit1").remove();

                Element pass1_user = document1.getElementById("pass1_user");
                pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
            }
            if(2 == language){
                document1.getElementById("chinese").attr("style", "display: none;");
                document1.getElementById("english").attr("style", "display: none;");
                document1.getElementById("invite2").attr("style", "display: none;");
                document1.getElementById("user2").attr("style", "display: none;");
                document1.getElementById("settle2").attr("style", "display: none;");
                document1.getElementById("email2").attr("style", "display: none;");
                document1.getElementById("bill2").attr("style", "display: none;");
                document1.getElementById("reward2").attr("style", "display: none;");
                document1.getElementById("rewardToday2").attr("style", "display: none;");
                document1.getElementById("driverAudit2").attr("style", "display: none;");
                document1.getElementById("carAudit2").attr("style", "display: none;");
                document1.getElementById("chinese").remove();
                document1.getElementById("english").remove();
                document1.getElementById("invite2").remove();
                document1.getElementById("user2").remove();
                document1.getElementById("settle2").remove();
                document1.getElementById("email2").remove();
                document1.getElementById("bill2").remove();
                document1.getElementById("reward2").remove();
                document1.getElementById("rewardToday2").remove();
                document1.getElementById("driverAudit2").remove();
                document1.getElementById("carAudit2").remove();

                Element pass2_user = document1.getElementById("pass2_user");
                pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1287,7 +1287,7 @@
     * @throws Exception
     */
    @Override
    public List<ActivityWarpper> queryMyActivity(Integer uid, Date time) throws Exception {
    public List<ActivityWarpper> queryMyActivity(Integer uid, Date time, Integer language) throws Exception {
        List<ActivityWarpper> list = new ArrayList<>();
        Map<String, Date> date = dateUtil.getStartAndEndDate(time);
        List<DriverActivityHistory> driverActivityHistories = driverActivityHistoryMapper.queryList(uid, null, null, date.get("startTime"), date.get("endTime"));
@@ -1315,7 +1315,7 @@
                    }
                    switch (driverActivityOnline.getType()){
                        case 1:
                            sb.append("专车");
                            sb.append(language == 1 ? "打车" : language == 2 ? "Ride" : "Rouler");
                            break;
                        case 2:
                            sb.append("出租车");
@@ -1325,6 +1325,7 @@
                            sb.append("城际出行");
                            break;
                        case 4:
                            sb.append(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
                            break;
                    }
                    String str = "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元";
@@ -1391,17 +1392,17 @@
                        String path1 = templatePath + "index.html";
                        Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                        if (1 == language) {
                            document1.getElementById("english").attr("style", "display: none;");
                            document1.getElementById("french").attr("style", "display: none;");
                            document1.getElementById("invite").attr("style", "display: none;");
                            document1.getElementById("user").attr("style", "display: none;");
                            document1.getElementById("settle").attr("style", "display: none;");
                            document1.getElementById("pass").attr("style", "display: none;");
                            document1.getElementById("email").attr("style", "display: none;");
                            document1.getElementById("bill").attr("style", "display: none;");
                            document1.getElementById("reward").attr("style", "display: none;");
                            document1.getElementById("driverAudit").attr("style", "display: none;");
                            document1.getElementById("carAudit").attr("style", "display: none;");
                            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("reward").remove();
                            document1.getElementById("driverAudit").remove();
                            document1.getElementById("carAudit").remove();

                            Element rewardToday_user = document1.getElementById("rewardToday_user");
                            rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1411,17 +1412,17 @@
                            rewardToday_content.text("邀请司机注册即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
                        }
                        if (2 == language) {
                            document1.getElementById("chinese").attr("style", "display: none;");
                            document1.getElementById("french").attr("style", "display: none;");
                            document1.getElementById("invite1").attr("style", "display: none;");
                            document1.getElementById("user1").attr("style", "display: none;");
                            document1.getElementById("settle1").attr("style", "display: none;");
                            document1.getElementById("pass1").attr("style", "display: none;");
                            document1.getElementById("email1").attr("style", "display: none;");
                            document1.getElementById("bill1").attr("style", "display: none;");
                            document1.getElementById("reward1").attr("style", "display: none;");
                            document1.getElementById("driverAudit1").attr("style", "display: none;");
                            document1.getElementById("carAudit1").attr("style", "display: none;");
                            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("reward1").remove();
                            document1.getElementById("driverAudit1").remove();
                            document1.getElementById("carAudit1").remove();

                            Element rewardToday1_user = document1.getElementById("rewardToday1_user");
                            rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1431,17 +1432,17 @@
                            rewardToday1_content.text("Invite drivers to register and get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
                        }
                        if (3 == language) {
                            document1.getElementById("chinese").attr("style", "display: none;");
                            document1.getElementById("french").attr("style", "display: none;");
                            document1.getElementById("invite2").attr("style", "display: none;");
                            document1.getElementById("user2").attr("style", "display: none;");
                            document1.getElementById("settle2").attr("style", "display: none;");
                            document1.getElementById("pass2").attr("style", "display: none;");
                            document1.getElementById("email2").attr("style", "display: none;");
                            document1.getElementById("bill2").attr("style", "display: none;");
                            document1.getElementById("reward2").attr("style", "display: none;");
                            document1.getElementById("driverAudit2").attr("style", "display: none;");
                            document1.getElementById("carAudit2").attr("style", "display: none;");
                            document1.getElementById("chinese").remove();
                            document1.getElementById("french").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("reward2").remove();
                            document1.getElementById("driverAudit2").remove();
                            document1.getElementById("carAudit2").remove();

                            Element rewardToday2_user = document1.getElementById("rewardToday2_user");
                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1472,17 +1473,17 @@
                        String path1 = templatePath + "index.html";
                        Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                        if (1 == language) {
                            document1.getElementById("english").attr("style", "display: none;");
                            document1.getElementById("french").attr("style", "display: none;");
                            document1.getElementById("invite").attr("style", "display: none;");
                            document1.getElementById("user").attr("style", "display: none;");
                            document1.getElementById("settle").attr("style", "display: none;");
                            document1.getElementById("pass").attr("style", "display: none;");
                            document1.getElementById("email").attr("style", "display: none;");
                            document1.getElementById("bill").attr("style", "display: none;");
                            document1.getElementById("reward").attr("style", "display: none;");
                            document1.getElementById("driverAudit").attr("style", "display: none;");
                            document1.getElementById("carAudit").attr("style", "display: none;");
                            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("reward").remove();
                            document1.getElementById("driverAudit").remove();
                            document1.getElementById("carAudit").remove();

                            Element rewardToday_user = document1.getElementById("rewardToday_user");
                            rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1492,17 +1493,17 @@
                            rewardToday_content.text("邀请用户注册即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
                        }
                        if (2 == language) {
                            document1.getElementById("chinese").attr("style", "display: none;");
                            document1.getElementById("french").attr("style", "display: none;");
                            document1.getElementById("invite1").attr("style", "display: none;");
                            document1.getElementById("user1").attr("style", "display: none;");
                            document1.getElementById("settle1").attr("style", "display: none;");
                            document1.getElementById("pass1").attr("style", "display: none;");
                            document1.getElementById("email1").attr("style", "display: none;");
                            document1.getElementById("bill1").attr("style", "display: none;");
                            document1.getElementById("reward1").attr("style", "display: none;");
                            document1.getElementById("driverAudit1").attr("style", "display: none;");
                            document1.getElementById("carAudit1").attr("style", "display: none;");
                            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("reward1").remove();
                            document1.getElementById("driverAudit1").remove();
                            document1.getElementById("carAudit1").remove();

                            Element rewardToday1_user = document1.getElementById("rewardToday1_user");
                            rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1512,17 +1513,17 @@
                            rewardToday1_content.text("Invite users to register and get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
                        }
                        if (3 == language) {
                            document1.getElementById("chinese").attr("style", "display: none;");
                            document1.getElementById("english").attr("style", "display: none;");
                            document1.getElementById("invite2").attr("style", "display: none;");
                            document1.getElementById("user2").attr("style", "display: none;");
                            document1.getElementById("settle2").attr("style", "display: none;");
                            document1.getElementById("pass2").attr("style", "display: none;");
                            document1.getElementById("email2").attr("style", "display: none;");
                            document1.getElementById("bill2").attr("style", "display: none;");
                            document1.getElementById("reward2").attr("style", "display: none;");
                            document1.getElementById("driverAudit2").attr("style", "display: none;");
                            document1.getElementById("carAudit2").attr("style", "display: none;");
                            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("reward2").remove();
                            document1.getElementById("driverAudit2").remove();
                            document1.getElementById("carAudit2").remove();

                            Element rewardToday2_user = document1.getElementById("rewardToday2_user");
                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1554,17 +1555,17 @@
                        String path1 = templatePath + "index.html";
                        Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                        if (1 == language) {
                            document1.getElementById("english").attr("style", "display: none;");
                            document1.getElementById("french").attr("style", "display: none;");
                            document1.getElementById("invite").attr("style", "display: none;");
                            document1.getElementById("user").attr("style", "display: none;");
                            document1.getElementById("settle").attr("style", "display: none;");
                            document1.getElementById("pass").attr("style", "display: none;");
                            document1.getElementById("email").attr("style", "display: none;");
                            document1.getElementById("bill").attr("style", "display: none;");
                            document1.getElementById("reward").attr("style", "display: none;");
                            document1.getElementById("driverAudit").attr("style", "display: none;");
                            document1.getElementById("carAudit").attr("style", "display: none;");
                            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("reward").remove();
                            document1.getElementById("driverAudit").remove();
                            document1.getElementById("carAudit").remove();

                            Element rewardToday_user = document1.getElementById("rewardToday_user");
                            rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1574,17 +1575,17 @@
                            rewardToday_content.text("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
                        }
                        if (2 == language) {
                            document1.getElementById("chinese").attr("style", "display: none;");
                            document1.getElementById("french").attr("style", "display: none;");
                            document1.getElementById("invite1").attr("style", "display: none;");
                            document1.getElementById("user1").attr("style", "display: none;");
                            document1.getElementById("settle1").attr("style", "display: none;");
                            document1.getElementById("pass1").attr("style", "display: none;");
                            document1.getElementById("email1").attr("style", "display: none;");
                            document1.getElementById("bill1").attr("style", "display: none;");
                            document1.getElementById("reward1").attr("style", "display: none;");
                            document1.getElementById("driverAudit1").attr("style", "display: none;");
                            document1.getElementById("carAudit1").attr("style", "display: none;");
                            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("reward1").remove();
                            document1.getElementById("driverAudit1").remove();
                            document1.getElementById("carAudit1").remove();

                            Element rewardToday1_user = document1.getElementById("rewardToday1_user");
                            rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1594,17 +1595,17 @@
                            rewardToday1_content.text("Accumulated online " + driverActivityOnline.getOnline() + " hours today to get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
                        }
                        if (3 == language) {
                            document1.getElementById("chinese").attr("style", "display: none;");
                            document1.getElementById("english").attr("style", "display: none;");
                            document1.getElementById("invite2").attr("style", "display: none;");
                            document1.getElementById("user2").attr("style", "display: none;");
                            document1.getElementById("settle2").attr("style", "display: none;");
                            document1.getElementById("pass2").attr("style", "display: none;");
                            document1.getElementById("email2").attr("style", "display: none;");
                            document1.getElementById("bill2").attr("style", "display: none;");
                            document1.getElementById("reward2").attr("style", "display: none;");
                            document1.getElementById("driverAudit2").attr("style", "display: none;");
                            document1.getElementById("carAudit2").attr("style", "display: none;");
                            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("reward2").remove();
                            document1.getElementById("driverAudit2").remove();
                            document1.getElementById("carAudit2").remove();

                            Element rewardToday2_user = document1.getElementById("rewardToday2_user");
                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1636,17 +1637,17 @@
                        String path1 = templatePath + "index.html";
                        Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                        if (1 == language) {
                            document1.getElementById("english").attr("style", "display: none;");
                            document1.getElementById("french").attr("style", "display: none;");
                            document1.getElementById("invite").attr("style", "display: none;");
                            document1.getElementById("user").attr("style", "display: none;");
                            document1.getElementById("settle").attr("style", "display: none;");
                            document1.getElementById("pass").attr("style", "display: none;");
                            document1.getElementById("email").attr("style", "display: none;");
                            document1.getElementById("bill").attr("style", "display: none;");
                            document1.getElementById("reward").attr("style", "display: none;");
                            document1.getElementById("driverAudit").attr("style", "display: none;");
                            document1.getElementById("carAudit").attr("style", "display: none;");
                            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("reward").remove();
                            document1.getElementById("driverAudit").remove();
                            document1.getElementById("carAudit").remove();

                            Element rewardToday_user = document1.getElementById("rewardToday_user");
                            rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1656,17 +1657,17 @@
                            rewardToday_content.text("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
                        }
                        if (2 == language) {
                            document1.getElementById("chinese").attr("style", "display: none;");
                            document1.getElementById("french").attr("style", "display: none;");
                            document1.getElementById("invite1").attr("style", "display: none;");
                            document1.getElementById("user1").attr("style", "display: none;");
                            document1.getElementById("settle1").attr("style", "display: none;");
                            document1.getElementById("pass1").attr("style", "display: none;");
                            document1.getElementById("email1").attr("style", "display: none;");
                            document1.getElementById("bill1").attr("style", "display: none;");
                            document1.getElementById("reward1").attr("style", "display: none;");
                            document1.getElementById("driverAudit1").attr("style", "display: none;");
                            document1.getElementById("carAudit1").attr("style", "display: none;");
                            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("reward1").remove();
                            document1.getElementById("driverAudit1").remove();
                            document1.getElementById("carAudit1").remove();

                            Element rewardToday1_user = document1.getElementById("rewardToday1_user");
                            rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1676,17 +1677,17 @@
                            rewardToday1_content.text("Complete " + driverActivityOrder.getOrderNum() + " orders in total today to get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
                        }
                        if (3 == language) {
                            document1.getElementById("chinese").attr("style", "display: none;");
                            document1.getElementById("english").attr("style", "display: none;");
                            document1.getElementById("invite2").attr("style", "display: none;");
                            document1.getElementById("user2").attr("style", "display: none;");
                            document1.getElementById("settle2").attr("style", "display: none;");
                            document1.getElementById("pass2").attr("style", "display: none;");
                            document1.getElementById("email2").attr("style", "display: none;");
                            document1.getElementById("bill2").attr("style", "display: none;");
                            document1.getElementById("reward2").attr("style", "display: none;");
                            document1.getElementById("driverAudit2").attr("style", "display: none;");
                            document1.getElementById("carAudit2").attr("style", "display: none;");
                            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("reward2").remove();
                            document1.getElementById("driverAudit2").remove();
                            document1.getElementById("carAudit2").remove();

                            Element rewardToday2_user = document1.getElementById("rewardToday2_user");
                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1740,17 +1741,17 @@
                        String path1 = templatePath + "index.html";
                        Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                        if (1 == language) {
                            document1.getElementById("english").attr("style", "display: none;");
                            document1.getElementById("french").attr("style", "display: none;");
                            document1.getElementById("invite").attr("style", "display: none;");
                            document1.getElementById("user").attr("style", "display: none;");
                            document1.getElementById("settle").attr("style", "display: none;");
                            document1.getElementById("pass").attr("style", "display: none;");
                            document1.getElementById("email").attr("style", "display: none;");
                            document1.getElementById("bill").attr("style", "display: none;");
                            document1.getElementById("rewardToday").attr("style", "display: none;");
                            document1.getElementById("driverAudit").attr("style", "display: none;");
                            document1.getElementById("carAudit").attr("style", "display: none;");
                            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();

                            Element reward_user = document1.getElementById("reward_user");
                            reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1758,17 +1759,17 @@
                            reward_content.text("今日累计在线 " + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收");
                        }
                        if (2 == language) {
                            document1.getElementById("chinese").attr("style", "display: none;");
                            document1.getElementById("french").attr("style", "display: none;");
                            document1.getElementById("invite1").attr("style", "display: none;");
                            document1.getElementById("user1").attr("style", "display: none;");
                            document1.getElementById("settle1").attr("style", "display: none;");
                            document1.getElementById("pass1").attr("style", "display: none;");
                            document1.getElementById("email1").attr("style", "display: none;");
                            document1.getElementById("bill1").attr("style", "display: none;");
                            document1.getElementById("rewardToday1").attr("style", "display: none;");
                            document1.getElementById("driverAudit1").attr("style", "display: none;");
                            document1.getElementById("carAudit1").attr("style", "display: none;");
                            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();

                            Element reward1_user = document1.getElementById("reward1_user");
                            reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1776,17 +1777,17 @@
                            reward1_content.text("accumulated online for " + dao.getOnline() + " hour today, get reward GHS" + dah.getMoney() + ", please check");
                        }
                        if (3 == language) {
                            document1.getElementById("chinese").attr("style", "display: none;");
                            document1.getElementById("english").attr("style", "display: none;");
                            document1.getElementById("invite2").attr("style", "display: none;");
                            document1.getElementById("user2").attr("style", "display: none;");
                            document1.getElementById("settle2").attr("style", "display: none;");
                            document1.getElementById("pass2").attr("style", "display: none;");
                            document1.getElementById("email2").attr("style", "display: none;");
                            document1.getElementById("bill2").attr("style", "display: none;");
                            document1.getElementById("rewardToday2").attr("style", "display: none;");
                            document1.getElementById("driverAudit2").attr("style", "display: none;");
                            document1.getElementById("carAudit2").attr("style", "display: none;");
                            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();

                            Element reward2_user = document1.getElementById("reward2_user");
                            reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1824,17 +1825,17 @@
                    String path1 = templatePath + "index.html";
                    Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                    if (1 == language) {
                        document1.getElementById("english").attr("style", "display: none;");
                        document1.getElementById("french").attr("style", "display: none;");
                        document1.getElementById("invite").attr("style", "display: none;");
                        document1.getElementById("user").attr("style", "display: none;");
                        document1.getElementById("settle").attr("style", "display: none;");
                        document1.getElementById("pass").attr("style", "display: none;");
                        document1.getElementById("email").attr("style", "display: none;");
                        document1.getElementById("bill").attr("style", "display: none;");
                        document1.getElementById("rewardToday").attr("style", "display: none;");
                        document1.getElementById("driverAudit").attr("style", "display: none;");
                        document1.getElementById("carAudit").attr("style", "display: none;");
                        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();

                        Element reward_user = document1.getElementById("reward_user");
                        reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1842,17 +1843,17 @@
                        reward_content.text("今日累计接单 " + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收");
                    }
                    if (2 == language) {
                        document1.getElementById("chinese").attr("style", "display: none;");
                        document1.getElementById("french").attr("style", "display: none;");
                        document1.getElementById("invite1").attr("style", "display: none;");
                        document1.getElementById("user1").attr("style", "display: none;");
                        document1.getElementById("settle1").attr("style", "display: none;");
                        document1.getElementById("pass1").attr("style", "display: none;");
                        document1.getElementById("email1").attr("style", "display: none;");
                        document1.getElementById("bill1").attr("style", "display: none;");
                        document1.getElementById("rewardToday1").attr("style", "display: none;");
                        document1.getElementById("driverAudit1").attr("style", "display: none;");
                        document1.getElementById("carAudit1").attr("style", "display: none;");
                        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();

                        Element reward1_user = document1.getElementById("reward1_user");
                        reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
@@ -1860,17 +1861,17 @@
                        reward1_content.text("A total of " + dao.getOrderNum() + " orders have been received today, and the reward GHS" + dah.getMoney() + " will be awarded, please check");
                    }
                    if (3 == language) {
                        document1.getElementById("chinese").attr("style", "display: none;");
                        document1.getElementById("english").attr("style", "display: none;");
                        document1.getElementById("invite2").attr("style", "display: none;");
                        document1.getElementById("user2").attr("style", "display: none;");
                        document1.getElementById("settle2").attr("style", "display: none;");
                        document1.getElementById("pass2").attr("style", "display: none;");
                        document1.getElementById("email2").attr("style", "display: none;");
                        document1.getElementById("bill2").attr("style", "display: none;");
                        document1.getElementById("rewardToday2").attr("style", "display: none;");
                        document1.getElementById("driverAudit2").attr("style", "display: none;");
                        document1.getElementById("carAudit2").attr("style", "display: none;");
                        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();

                        Element reward2_user = document1.getElementById("reward2_user");
                        reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java

@@ -95,7 +95,7 @@
        // 接收短信的手机号码
        request.putQueryParameter("PhoneNumbers", phone);
        // 短信签名名称。请在控制台签名管理页面签名名称一列查看（必须是已添加、并通过审核的短信签名）。
        request.putQueryParameter("SignName", "飞马打车");
        request.putQueryParameter("SignName", "打车");
        // 短信模板ID
        request.putQueryParameter("TemplateCode", templateCode);
        // 短信模板变量对应的实际值，JSON格式。

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/EmailUtil.java

@@ -90,7 +90,10 @@
        //设置邮件的发送时间,默认立即发送
        msg.setSentDate(new Date());

        Transport.send(msg);
        Transport transport = session.getTransport();
        transport.connect();
        transport.sendMessage(msg, msg.getAllRecipients());
        transport.close();
        return true;
    }
}