修改bug

Pu Zhibing

2025-04-02 e1940dda45fa066d994cc5cf0e34c7f97d9e7b2d

修改bug

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java

@@ -287,7 +287,7 @@
    @TableField("payMoney")
    private Double payMoney;
    /**
     * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=改派中，12=已支付差价，13=取消待支付)
     * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付，13=补差价)
     */
    @TableField("state")
    private Integer state;

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

@@ -849,6 +849,9 @@
     */
    public OrderLogistics setMoney(OrderLogistics orderLogistics, Double parkingFee, Double crossingFee) throws Exception {
        Map<String, Object> query1 = systemPriceMapper.query(orderLogistics.getCompanyId(), 4, orderLogistics.getServerCarModelId());
        if(null == query1){
            throw new RuntimeException("请先添加计费规则");
        }
        //开始根据不同的方式计算金额
        double amount = 0;
        JSONObject jsonObject = JSON.parseObject(query1.get("content").toString());

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

@@ -725,11 +725,11 @@
            orderPrivateCar.setState(7);
        }

        Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
        if(String.valueOf(map.get("code")).equals("200")){
            orderPrivateCar.setTelX("");
            orderPrivateCar.setBindId("");
        }
//        Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
//        if(String.valueOf(map.get("code")).equals("200")){
//            orderPrivateCar.setTelX("");
//            orderPrivateCar.setBindId("");
//        }
        this.updateById(orderPrivateCar);
        
        //修改行程数据
@@ -890,6 +890,9 @@
     */
    public OrderPrivateCar setMoney(OrderPrivateCar orderPrivateCar, Double parkingFee, Double crossingFee) throws Exception {
        Map<String, Object> query1 = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId());
        if(null == query1){
            throw new RuntimeException("请先添加计费规则");
        }
        //开始根据不同的方式计算金额
        double amount = 0;
        JSONObject jsonObject = JSON.parseObject(query1.get("content").toString());

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java

@@ -58,6 +58,12 @@
     */
    @TableField("insertTime")
    private Date insertTime;
    /**
     * 完成时间
     */
    @TableField("completionTime")
    private Date completionTime;
    

    public Integer getId() {
        return id;
@@ -130,7 +136,15 @@
    public void setInsertTime(Date insertTime) {
        this.insertTime = insertTime;
    }

    
    public Date getCompletionTime() {
        return completionTime;
    }
    
    public void setCompletionTime(Date completionTime) {
        this.completionTime = completionTime;
    }
    
    @Override
    public String toString() {
        return "DriverActivityHistory{" +

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

@@ -338,6 +338,7 @@
                    bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
                    incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
                    driverActivityHistory.setCarryOut(2);
                    driverActivityHistory.setCompletionTime(new Date());
                    driverActivityHistoryMapper.updateById(driverActivityHistory);
                }
                driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -521,12 +522,13 @@
            if(type == 2){
                driver = driverMapper.selectById(uid);
                Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
                List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(null, 1, 1, date.get("startTime"), date.get("endTime"));
                List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(uid, 1, 1, date.get("startTime"), date.get("endTime"));
                BigDecimal bigDecimal = new BigDecimal("0");
                for (DriverActivityHistory driverActivityHistory : list) {
                    bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
                    incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
                    driverActivityHistory.setCarryOut(2);
                    driverActivityHistory.setCompletionTime(new Date());
                    driverActivityHistoryMapper.updateById(driverActivityHistory);
                }
                driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -535,98 +537,109 @@
                driverMapper.updateById(driver);

                if(ToolUtil.isNotEmpty(driver.getEmail())){
                    String path = templatePath + "driver/index.html";
                    Document document = Jsoup.parse(new File(path), "UTF-8");
                    if(1 == language){
                        document.getElementById("english").remove();
                        document.getElementById("french").remove();
                        document.getElementById("user").remove();
                        document.getElementById("settle").remove();
                        document.getElementById("pass").remove();
                        document.getElementById("email").remove();
                        document.getElementById("bill").remove();
                        document.getElementById("reward").remove();
                        document.getElementById("rewardToday").remove();
                        document.getElementById("driverAudit").remove();
                        document.getElementById("carAudit").remove();

                        document.getElementsByTag("title").get(0).text("司机奖励通知");
                        Element invite_user = document.getElementById("invite_user");
                        invite_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
                        Element invite_content = document.getElementById("invite_content");
                        invite_content.text("您已成功邀请一位司机注册I-GO，获得奖励GHS " + bigDecimal.doubleValue() + "，请查收");
                    }
                    if(2 == language){
                        document.getElementById("chinese").remove();
                        document.getElementById("french").remove();
                        document.getElementById("user1").remove();
                        document.getElementById("settle1").remove();
                        document.getElementById("pass1").remove();
                        document.getElementById("email1").remove();
                        document.getElementById("bill1").remove();
                        document.getElementById("reward1").remove();
                        document.getElementById("rewardToday1").remove();
                        document.getElementById("driverAudit1").remove();
                        document.getElementById("carAudit1").remove();

                        document.getElementsByTag("title").get(0).text("Reward-driver notice");
                        Element invite1_user = document.getElementById("invite1_user");
                        invite1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                        Element invite1_content = document.getElementById("invite1_content");
                        invite1_content.text("You have succeeded to invite a driver to register with I-GO, so you received a GHS " + bigDecimal.doubleValue() + " bonus, please check your balance.");
                    }
                    if(3 == language){
                        document.getElementById("chinese").remove();
                        document.getElementById("english").remove();
                        document.getElementById("user2").remove();
                        document.getElementById("settle2").remove();
                        document.getElementById("pass2").remove();
                        document.getElementById("email2").remove();
                        document.getElementById("bill2").remove();
                        document.getElementById("reward2").remove();
                        document.getElementById("rewardToday2").remove();
                        document.getElementById("driverAudit2").remove();
                        document.getElementById("carAudit2").remove();

                        document.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
                        Element invite2_user = document.getElementById("invite2_user");
                        invite2_user.text("Bonjour " + driver.getFirstName() + " " + driver.getLastName() + "，");
                        Element invite2_content = document.getElementById("invite2_content");
                        invite2_content.text("Vous avez invité avec succès un conducteur à s’inscrire à i-go pour recevoir une récompense GHS " + bigDecimal.doubleValue() + ". Veuillez vérifier");
                    }
                    EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense",  document.html());
                    String randomString = ToolUtil.getRandomString(10);
                    //开始生成pdf收据和html收据
                    File file = new File("/home/igotechgh/nginx/html/files/html/");
                    if(!file.exists()){
                        file.mkdirs();
                    }
                    file = new File("/home/igotechgh/nginx/html/files/html/invitation_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }
                    FileWriter fileWriter = new FileWriter(file);
                    fileWriter.write(document.html());
                    fileWriter.flush();
                    fileWriter.close();

                    String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html";
                    TEmail tEmail = new TEmail();
                    tEmail.setLink(link);
                    tEmail.setUserId(driver.getId());
                    tEmail.setType(2);
                    tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
                    tEmail.setCreateTime(new Date());
                    int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                    String week = EmailUtil.getWeek(language, i);
                    tEmail.setWeek(week);
                    boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                    if(am){
                        tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                    }else {
                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                    }
                    emailService.insert(tEmail);
                    Driver finalDriver = driver;
                    BigDecimal finalBigDecimal = bigDecimal;
                    new Thread(new Runnable() {
                        @Override
                        public void run() {
                            try {
                                String path = templatePath + "driver/index.html";
                                Document document = Jsoup.parse(new File(path), "UTF-8");
                                if(1 == language){
                                    document.getElementById("english").remove();
                                    document.getElementById("french").remove();
                                    document.getElementById("user").remove();
                                    document.getElementById("settle").remove();
                                    document.getElementById("pass").remove();
                                    document.getElementById("email").remove();
                                    document.getElementById("bill").remove();
                                    document.getElementById("reward").remove();
                                    document.getElementById("rewardToday").remove();
                                    document.getElementById("driverAudit").remove();
                                    document.getElementById("carAudit").remove();
        
                                    document.getElementsByTag("title").get(0).text("司机奖励通知");
                                    Element invite_user = document.getElementById("invite_user");
                                    invite_user.text("您好 " + finalDriver.getFirstName() + "" + finalDriver.getLastName() + "，");
                                    Element invite_content = document.getElementById("invite_content");
                                    invite_content.text("您已成功邀请一位司机注册I-GO，获得奖励GHS " + finalBigDecimal.doubleValue() + "，请查收");
                                }
                                if(2 == language){
                                    document.getElementById("chinese").remove();
                                    document.getElementById("french").remove();
                                    document.getElementById("user1").remove();
                                    document.getElementById("settle1").remove();
                                    document.getElementById("pass1").remove();
                                    document.getElementById("email1").remove();
                                    document.getElementById("bill1").remove();
                                    document.getElementById("reward1").remove();
                                    document.getElementById("rewardToday1").remove();
                                    document.getElementById("driverAudit1").remove();
                                    document.getElementById("carAudit1").remove();
        
                                    document.getElementsByTag("title").get(0).text("Reward-driver notice");
                                    Element invite1_user = document.getElementById("invite1_user");
                                    invite1_user.text("Hello " + finalDriver.getFirstName() + "" + finalDriver.getLastName() + "，");
                                    Element invite1_content = document.getElementById("invite1_content");
                                    invite1_content.text("You have succeeded to invite a driver to register with I-GO, so you received a GHS " + finalBigDecimal.doubleValue() + " bonus, please check your balance.");
                                }
                                if(3 == language){
                                    document.getElementById("chinese").remove();
                                    document.getElementById("english").remove();
                                    document.getElementById("user2").remove();
                                    document.getElementById("settle2").remove();
                                    document.getElementById("pass2").remove();
                                    document.getElementById("email2").remove();
                                    document.getElementById("bill2").remove();
                                    document.getElementById("reward2").remove();
                                    document.getElementById("rewardToday2").remove();
                                    document.getElementById("driverAudit2").remove();
                                    document.getElementById("carAudit2").remove();
        
                                    document.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
                                    Element invite2_user = document.getElementById("invite2_user");
                                    invite2_user.text("Bonjour " + finalDriver.getFirstName() + " " + finalDriver.getLastName() + "，");
                                    Element invite2_content = document.getElementById("invite2_content");
                                    invite2_content.text("Vous avez invité avec succès un conducteur à s’inscrire à i-go pour recevoir une récompense GHS " + finalBigDecimal.doubleValue() + ". Veuillez vérifier");
                                }
                                EmailUtil.send(finalDriver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense",  document.html());
                                String randomString = ToolUtil.getRandomString(10);
                                //开始生成pdf收据和html收据
                                File file = new File("/home/igotechgh/nginx/html/files/html/");
                                if(!file.exists()){
                                    file.mkdirs();
                                }
                                file = new File("/home/igotechgh/nginx/html/files/html/invitation_" + randomString + ".html");
                                if(!file.exists()){
                                    file.createNewFile();
                                }
                                FileWriter fileWriter = new FileWriter(file);
                                fileWriter.write(document.html());
                                fileWriter.flush();
                                fileWriter.close();
    
                                String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html";
                                TEmail tEmail = new TEmail();
                                tEmail.setLink(link);
                                tEmail.setUserId(finalDriver.getId());
                                tEmail.setType(2);
                                tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
                                tEmail.setCreateTime(new Date());
                                int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                                String week = EmailUtil.getWeek(language, i);
                                tEmail.setWeek(week);
                                boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                                if(am){
                                    tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                                }else {
                                    tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                                }
                                emailService.insert(tEmail);
                            }catch (Exception e){
                                e.printStackTrace();
                            }
                        }
                    }).start();
                }

            }
@@ -2527,6 +2540,7 @@
            List<DriverOnline> driverOnlines = driverOnlineMapper.queryList(sdf.format(new Date()), null, dah.getDriverId(), duration);
            if(driverOnlines.size() > 0){
                dah.setCarryOut(2);//完成状态
                dah.setCompletionTime(new Date());
                driverActivityHistoryMapper.updateById(dah);
    
                redisUtil.remove("driverActivity_" + dah.getDriverId() + "_" + dah.getId());
@@ -2546,98 +2560,107 @@
    
                Integer language = driver.getLanguage();
                if(ToolUtil.isNotEmpty(driver.getEmail())) {
                    String path1 = templatePath + "driver/index.html";
                    Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                    if (1 == language) {
                        document1.getElementById("english").remove();
                        document1.getElementById("french").remove();
                        document1.getElementById("invite").remove();
                        document1.getElementById("user").remove();
                        document1.getElementById("settle").remove();
                        document1.getElementById("pass").remove();
                        document1.getElementById("email").remove();
                        document1.getElementById("bill").remove();
                        document1.getElementById("rewardToday").remove();
                        document1.getElementById("driverAudit").remove();
                        document1.getElementById("carAudit").remove();
            
                        document1.getElementsByTag("title").get(0).text("司机奖励通知");
                        Element reward_user = document1.getElementById("reward_user");
                        reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
                        Element reward_content = document1.getElementById("reward_content");
                        reward_content.html("今日累计在线" + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收。<br/>详情请查看I-GO平台。");
                    }
                    if (2 == language) {
                        document1.getElementById("chinese").remove();
                        document1.getElementById("french").remove();
                        document1.getElementById("invite1").remove();
                        document1.getElementById("user1").remove();
                        document1.getElementById("settle1").remove();
                        document1.getElementById("pass1").remove();
                        document1.getElementById("email1").remove();
                        document1.getElementById("bill1").remove();
                        document1.getElementById("rewardToday1").remove();
                        document1.getElementById("driverAudit1").remove();
                        document1.getElementById("carAudit1").remove();
            
                        document1.getElementsByTag("title").get(0).text("Reward-driver notice");
                        Element reward1_user = document1.getElementById("reward1_user");
                        reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                        Element reward1_content = document1.getElementById("reward1_content");
                        reward1_content.html("You stayed online for " + dao.getOnline() + " hours today, and got a bonus of GHS" + dah.getMoney() + ", please check.<br/>Check your app for more details.");
                    }
                    if (3 == language) {
                        document1.getElementById("chinese").remove();
                        document1.getElementById("english").remove();
                        document1.getElementById("invite2").remove();
                        document1.getElementById("user2").remove();
                        document1.getElementById("settle2").remove();
                        document1.getElementById("pass2").remove();
                        document1.getElementById("email2").remove();
                        document1.getElementById("bill2").remove();
                        document1.getElementById("rewardToday2").remove();
                        document1.getElementById("driverAudit2").remove();
                        document1.getElementById("carAudit2").remove();
            
                        document1.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
                        Element reward2_user = document1.getElementById("reward2_user");
                        reward2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
                        Element reward2_content = document1.getElementById("reward2_content");
                        reward2_content.html("Vous êtes resté en ligne pendant " + dao.getOnline() + " heures aujourd’hui et avez obtenu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails.");
                    }
                    EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
                    String randomString = ToolUtil.getRandomString(10);
                    //开始生成pdf收据和html收据
                    File file = new File("/home/igotechgh/nginx/html/files/html/");
                    if(!file.exists()){
                        file.mkdirs();
                    }
                    file = new File("/home/igotechgh/nginx/html/files/html/rewards_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }
                    FileWriter fileWriter = new FileWriter(file);
                    fileWriter.write(document1.html());
                    fileWriter.flush();
                    fileWriter.close();
                    new Thread(new Runnable() {
                        @Override
                        public void run() {
                            try {
                                String path1 = templatePath + "driver/index.html";
                                Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                                if (1 == language) {
                                    document1.getElementById("english").remove();
                                    document1.getElementById("french").remove();
                                    document1.getElementById("invite").remove();
                                    document1.getElementById("user").remove();
                                    document1.getElementById("settle").remove();
                                    document1.getElementById("pass").remove();
                                    document1.getElementById("email").remove();
                                    document1.getElementById("bill").remove();
                                    document1.getElementById("rewardToday").remove();
                                    document1.getElementById("driverAudit").remove();
                                    document1.getElementById("carAudit").remove();
        
                    String link ="https://igo.i-go.group/files/html/rewards_" + randomString + ".html";
                    TEmail tEmail = new TEmail();
                    tEmail.setLink(link);
                    tEmail.setUserId(driver.getId());
                    tEmail.setType(2);
                    tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
                    tEmail.setCreateTime(new Date());
                    int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                    String week = EmailUtil.getWeek(language, i);
                    tEmail.setWeek(week);
                    boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                    if(am){
                        tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                    }else {
                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                    }
                    emailService.insert(tEmail);
                                    document1.getElementsByTag("title").get(0).text("司机奖励通知");
                                    Element reward_user = document1.getElementById("reward_user");
                                    reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
                                    Element reward_content = document1.getElementById("reward_content");
                                    reward_content.html("今日累计在线" + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收。<br/>详情请查看I-GO平台。");
                                }
                                if (2 == language) {
                                    document1.getElementById("chinese").remove();
                                    document1.getElementById("french").remove();
                                    document1.getElementById("invite1").remove();
                                    document1.getElementById("user1").remove();
                                    document1.getElementById("settle1").remove();
                                    document1.getElementById("pass1").remove();
                                    document1.getElementById("email1").remove();
                                    document1.getElementById("bill1").remove();
                                    document1.getElementById("rewardToday1").remove();
                                    document1.getElementById("driverAudit1").remove();
                                    document1.getElementById("carAudit1").remove();
        
                                    document1.getElementsByTag("title").get(0).text("Reward-driver notice");
                                    Element reward1_user = document1.getElementById("reward1_user");
                                    reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                                    Element reward1_content = document1.getElementById("reward1_content");
                                    reward1_content.html("You stayed online for " + dao.getOnline() + " hours today, and got a bonus of GHS" + dah.getMoney() + ", please check.<br/>Check your app for more details.");
                                }
                                if (3 == language) {
                                    document1.getElementById("chinese").remove();
                                    document1.getElementById("english").remove();
                                    document1.getElementById("invite2").remove();
                                    document1.getElementById("user2").remove();
                                    document1.getElementById("settle2").remove();
                                    document1.getElementById("pass2").remove();
                                    document1.getElementById("email2").remove();
                                    document1.getElementById("bill2").remove();
                                    document1.getElementById("rewardToday2").remove();
                                    document1.getElementById("driverAudit2").remove();
                                    document1.getElementById("carAudit2").remove();
        
                                    document1.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
                                    Element reward2_user = document1.getElementById("reward2_user");
                                    reward2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
                                    Element reward2_content = document1.getElementById("reward2_content");
                                    reward2_content.html("Vous êtes resté en ligne pendant " + dao.getOnline() + " heures aujourd’hui et avez obtenu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails.");
                                }
                                EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
                                String randomString = ToolUtil.getRandomString(10);
                                //开始生成pdf收据和html收据
                                File file = new File("/home/igotechgh/nginx/html/files/html/");
                                if(!file.exists()){
                                    file.mkdirs();
                                }
                                file = new File("/home/igotechgh/nginx/html/files/html/rewards_" + randomString + ".html");
                                if(!file.exists()){
                                    file.createNewFile();
                                }
                                FileWriter fileWriter = new FileWriter(file);
                                fileWriter.write(document1.html());
                                fileWriter.flush();
                                fileWriter.close();
    
                                String link ="https://igo.i-go.group/files/html/rewards_" + randomString + ".html";
                                TEmail tEmail = new TEmail();
                                tEmail.setLink(link);
                                tEmail.setUserId(driver.getId());
                                tEmail.setType(2);
                                tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
                                tEmail.setCreateTime(new Date());
                                int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                                String week = EmailUtil.getWeek(language, i);
                                tEmail.setWeek(week);
                                boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                                if(am){
                                    tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                                }else {
                                    tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                                }
                                emailService.insert(tEmail);
                            }catch (Exception e){
                                e.printStackTrace();
                            }
                        }
                    }).start();
                }
            }
        }
@@ -2649,6 +2672,7 @@
            Integer integer = orderService.queryOrderNum(dah.getDriverId(), date.get("startTime"), date.get("endTime"));
            if(dao.getOrderNum() <= integer){
                dah.setCarryOut(2);//完成状态
                dah.setCompletionTime(new Date());
                driverActivityHistoryMapper.updateById(dah);
                //修改余额
                Driver driver = this.selectById(dah.getDriverId());
@@ -2665,99 +2689,108 @@
    
                Integer language = driver.getLanguage();
                if(ToolUtil.isNotEmpty(driver.getEmail())) {
                    String path1 = templatePath + "driver/index.html";
                    Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                    if (1 == language) {
                        document1.getElementById("english").remove();
                        document1.getElementById("french").remove();
                        document1.getElementById("invite").remove();
                        document1.getElementById("user").remove();
                        document1.getElementById("settle").remove();
                        document1.getElementById("pass").remove();
                        document1.getElementById("email").remove();
                        document1.getElementById("bill").remove();
                        document1.getElementById("rewardToday").remove();
                        document1.getElementById("driverAudit").remove();
                        document1.getElementById("carAudit").remove();

                        document1.getElementsByTag("title").get(0).text("司机奖励通知");
                        Element reward_user = document1.getElementById("reward_user");
                        reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
                        Element reward_content = document1.getElementById("reward_content");
                        reward_content.html("今日累计接单" + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收。<br/>详情请查看I-GO平台。");
                    }
                    if (2 == language) {
                        document1.getElementById("chinese").remove();
                        document1.getElementById("french").remove();
                        document1.getElementById("invite1").remove();
                        document1.getElementById("user1").remove();
                        document1.getElementById("settle1").remove();
                        document1.getElementById("pass1").remove();
                        document1.getElementById("email1").remove();
                        document1.getElementById("bill1").remove();
                        document1.getElementById("rewardToday1").remove();
                        document1.getElementById("driverAudit1").remove();
                        document1.getElementById("carAudit1").remove();

                        document1.getElementsByTag("title").get(0).text("Reward-driver notice");
                        Element reward1_user = document1.getElementById("reward1_user");
                        reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                        Element reward1_content = document1.getElementById("reward1_content");
                        reward1_content.html("You completed " + dao.getOrderNum() + " trips today, and got a bonus of GHS" + dah.getMoney() + ", please check.<br/>Check your app for more details.");
                    }
                    if (3 == language) {
                        document1.getElementById("chinese").remove();
                        document1.getElementById("english").remove();
                        document1.getElementById("invite2").remove();
                        document1.getElementById("user2").remove();
                        document1.getElementById("settle2").remove();
                        document1.getElementById("pass2").remove();
                        document1.getElementById("email2").remove();
                        document1.getElementById("bill2").remove();
                        document1.getElementById("rewardToday2").remove();
                        document1.getElementById("driverAudit2").remove();
                        document1.getElementById("carAudit2").remove();

                        document1.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
                        Element reward2_user = document1.getElementById("reward2_user");
                        reward2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
                        Element reward2_content = document1.getElementById("reward2_content");
                        reward2_content.html("Vous avez effectué " + dao.getOrderNum() + " trajets aujourd’hui et avez reçu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails.");
                    }

                    EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
                    String randomString = ToolUtil.getRandomString(10);
                    //开始生成pdf收据和html收据
                    File file = new File("/home/igotechgh/nginx/html/files/html/");
                    if(!file.exists()){
                        file.mkdirs();
                    }
                    file = new File("/home/igotechgh/nginx/html/files/html/rewards_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }
                    FileWriter fileWriter = new FileWriter(file);
                    fileWriter.write(document1.html());
                    fileWriter.flush();
                    fileWriter.close();

                    String link ="https://igo.i-go.group/files/html/rewards_" + randomString + ".html";
                    TEmail tEmail = new TEmail();
                    tEmail.setLink(link);
                    tEmail.setUserId(driver.getId());
                    tEmail.setType(2);
                    tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
                    tEmail.setCreateTime(new Date());
                    int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                    String week = EmailUtil.getWeek(language, i);
                    tEmail.setWeek(week);
                    boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                    if(am){
                        tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                    }else {
                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                    }
                    emailService.insert(tEmail);
                    new Thread(new Runnable() {
                        @Override
                        public void run() {
                            try {
                                String path1 = templatePath + "driver/index.html";
                                Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                                if (1 == language) {
                                    document1.getElementById("english").remove();
                                    document1.getElementById("french").remove();
                                    document1.getElementById("invite").remove();
                                    document1.getElementById("user").remove();
                                    document1.getElementById("settle").remove();
                                    document1.getElementById("pass").remove();
                                    document1.getElementById("email").remove();
                                    document1.getElementById("bill").remove();
                                    document1.getElementById("rewardToday").remove();
                                    document1.getElementById("driverAudit").remove();
                                    document1.getElementById("carAudit").remove();
        
                                    document1.getElementsByTag("title").get(0).text("司机奖励通知");
                                    Element reward_user = document1.getElementById("reward_user");
                                    reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
                                    Element reward_content = document1.getElementById("reward_content");
                                    reward_content.html("今日累计接单" + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收。<br/>详情请查看I-GO平台。");
                                }
                                if (2 == language) {
                                    document1.getElementById("chinese").remove();
                                    document1.getElementById("french").remove();
                                    document1.getElementById("invite1").remove();
                                    document1.getElementById("user1").remove();
                                    document1.getElementById("settle1").remove();
                                    document1.getElementById("pass1").remove();
                                    document1.getElementById("email1").remove();
                                    document1.getElementById("bill1").remove();
                                    document1.getElementById("rewardToday1").remove();
                                    document1.getElementById("driverAudit1").remove();
                                    document1.getElementById("carAudit1").remove();
        
                                    document1.getElementsByTag("title").get(0).text("Reward-driver notice");
                                    Element reward1_user = document1.getElementById("reward1_user");
                                    reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                                    Element reward1_content = document1.getElementById("reward1_content");
                                    reward1_content.html("You completed " + dao.getOrderNum() + " trips today, and got a bonus of GHS" + dah.getMoney() + ", please check.<br/>Check your app for more details.");
                                }
                                if (3 == language) {
                                    document1.getElementById("chinese").remove();
                                    document1.getElementById("english").remove();
                                    document1.getElementById("invite2").remove();
                                    document1.getElementById("user2").remove();
                                    document1.getElementById("settle2").remove();
                                    document1.getElementById("pass2").remove();
                                    document1.getElementById("email2").remove();
                                    document1.getElementById("bill2").remove();
                                    document1.getElementById("rewardToday2").remove();
                                    document1.getElementById("driverAudit2").remove();
                                    document1.getElementById("carAudit2").remove();
        
                                    document1.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
                                    Element reward2_user = document1.getElementById("reward2_user");
                                    reward2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
                                    Element reward2_content = document1.getElementById("reward2_content");
                                    reward2_content.html("Vous avez effectué " + dao.getOrderNum() + " trajets aujourd’hui et avez reçu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails.");
                                }
    
                                EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
                                String randomString = ToolUtil.getRandomString(10);
                                //开始生成pdf收据和html收据
                                File file = new File("/home/igotechgh/nginx/html/files/html/");
                                if(!file.exists()){
                                    file.mkdirs();
                                }
                                file = new File("/home/igotechgh/nginx/html/files/html/rewards_" + randomString + ".html");
                                if(!file.exists()){
                                    file.createNewFile();
                                }
                                FileWriter fileWriter = new FileWriter(file);
                                fileWriter.write(document1.html());
                                fileWriter.flush();
                                fileWriter.close();
    
                                String link ="https://igo.i-go.group/files/html/rewards_" + randomString + ".html";
                                TEmail tEmail = new TEmail();
                                tEmail.setLink(link);
                                tEmail.setUserId(driver.getId());
                                tEmail.setType(2);
                                tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
                                tEmail.setCreateTime(new Date());
                                int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                                String week = EmailUtil.getWeek(language, i);
                                tEmail.setWeek(week);
                                boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                                if(am){
                                    tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                                }else {
                                    tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                                }
                                emailService.insert(tEmail);
                            }catch (Exception e){
                                e.printStackTrace();
                            }
                        }
                    }).start();
                }
            }
        }

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -1582,7 +1582,7 @@
            if(ToolUtil.isEmpty(userInfo.getPhone())){
                return ResultUtil.error("请先绑定手机号码");
            }
            orderPrivateCar.setPassengers(userInfo.getFirstName() + "." + userInfo.getLastName());
            orderPrivateCar.setPassengers(ToolUtil.isNotEmpty(userInfo.getFirstName()) ? userInfo.getFirstName() + "." + userInfo.getLastName() : "");
            orderPrivateCar.setPassengersPhone(userInfo.getPhone());
        }
        orderPrivateCar.setState(1);

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

@@ -3498,7 +3498,10 @@
        BaseWarpper baseWarpper = new BaseWarpper();
        double amount = 0;
        CancleOrder query = cancleOrderService.query(orderLogistics.getCompanyId());
        if(null == query || null == orderLogistics.getDriverId() || orderLogistics.getState() == 11){
        if(null == query){
            return ResultUtil.error("请先添加取消规则");
        }
        if(null == orderLogistics.getDriverId() || orderLogistics.getState() == 11){
            baseWarpper.setAmount(amount);
            return ResultUtil.success(baseWarpper);
        }

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

@@ -311,7 +311,7 @@
        orderPrivateCar.setPassengers(name);
        orderPrivateCar.setPassengersPhone(phone);
        if(instead == 0 || ToolUtil.isEmpty(orderPrivateCar.getPassengers())){
            orderPrivateCar.setPassengers(userInfo.getFirstName() + "." + userInfo.getLastName());
            orderPrivateCar.setPassengers(ToolUtil.isNotEmpty(userInfo.getFirstName()) ? userInfo.getFirstName() + "." + userInfo.getLastName() : "");
            orderPrivateCar.setPassengersPhone(userInfo.getPhone());
        }
        orderPrivateCar.setState(1);
@@ -729,7 +729,10 @@
        BaseWarpper baseWarpper = new BaseWarpper();
        double amount = 0;
        CancleOrder query = cancleOrderService.query(orderPrivateCar.getCompanyId());
        if(null == query || null == orderPrivateCar.getDriverId() || orderPrivateCar.getState() == 11){
        if(null == query){
            return ResultUtil.error("请先添加取消规则");
        }
        if(null == orderPrivateCar.getDriverId() || orderPrivateCar.getState() == 11){
            baseWarpper.setAmount(amount);
            return ResultUtil.success(baseWarpper);
        }

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml

@@ -13,7 +13,7 @@
        carryOut as carryOut,
        money as money,
        insertTime as insertTime
        from t_driver_activity_history where `day` between #{start} and #{end} and driverActivityId in (select id from t_driver_activity where status = 3 and now() between startTime and endTime)
        from t_driver_activity_history where `day` between DATE_FORMAT(#{start}, '%Y-%m-%d') and DATE_FORMAT(#{end}, '%Y-%m-%d') and driverActivityId in (select id from t_driver_activity where status = 3 and now() between startTime and endTime)
        <if test="null != type">
            and `type` = #{type}
        </if>

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java

@@ -58,6 +58,11 @@
     */
    @TableField("insertTime")
    private Date insertTime;
    /**
     * 完成时间
     */
    @TableField("completionTime")
    private Date completionTime;

    public Integer getId() {
        return id;
@@ -130,7 +135,15 @@
    public void setInsertTime(Date insertTime) {
        this.insertTime = insertTime;
    }

    
    public Date getCompletionTime() {
        return completionTime;
    }
    
    public void setCompletionTime(Date completionTime) {
        this.completionTime = completionTime;
    }
    
    @Override
    public String toString() {
        return "DriverActivityHistory{" +

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java

@@ -316,6 +316,7 @@
                        bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
                        incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
                        driverActivityHistory.setCarryOut(2);
                        driverActivityHistory.setCompletionTime(new Date());
                        driverActivityHistoryMapper.updateById(driverActivityHistory);
                    }
                    
@@ -669,6 +670,7 @@
                        bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
                        incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
                        driverActivityHistory.setCarryOut(2);
                        driverActivityHistory.setCompletionTime(new Date());
                        driverActivityHistoryMapper.updateById(driverActivityHistory);
                    }
                    driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -677,88 +679,98 @@
                    driverMapper.updateById(driver);

                    if(ToolUtil.isNotEmpty(driver.getEmail())){
                        String path1 = templatePath + "driver/index.html";
                        Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                        if(1 == language){
                            document1.getElementById("english").remove();
                            document1.getElementById("french").remove();
                            document1.getElementById("invite").remove();
                            document1.getElementById("settle").remove();
                            document1.getElementById("pass").remove();
                            document1.getElementById("bill").remove();
                            document1.getElementById("reward").remove();
                            document1.getElementById("rewardToday").remove();

                            document1.getElementsByTag("title").get(0).text("司机奖励通知");
                            Element user_user = document1.getElementById("user_user");
                            user_user.text("您好 " + driver.getFirstName() + " " + driver.getLastName() + "，");
                            Element user_content = document1.getElementById("user_content");
                            user_content.text("您已成功邀请一位用户注册I-GO，获得奖励GHS " + bigDecimal.doubleValue() + "，请查收");
                        }
                        if(2 == language){
                            document1.getElementById("chinese").remove();
                            document1.getElementById("french").remove();
                            document1.getElementById("invite1").remove();
                            document1.getElementById("settle1").remove();
                            document1.getElementById("pass1").remove();
                            document1.getElementById("bill1").remove();
                            document1.getElementById("reward1").remove();
                            document1.getElementById("rewardToday1").remove();

                            document1.getElementsByTag("title").get(0).text("Reward-driver notice");
                            Element user1_user = document1.getElementById("user1_user");
                            user1_user.text("Hello " + driver.getFirstName() + " " + driver.getLastName() + "，");
                            Element user1_content = document1.getElementById("user1_content");
                            user1_content.text("You have succeeded to invite a rider to register with I-GO, so you received a GHS " + bigDecimal.doubleValue() + " bonus, please check your balance.");
                        }
                        if(3 == language){
                            document1.getElementById("chinese").remove();
                            document1.getElementById("english").remove();
                            document1.getElementById("invite1").remove();
                            document1.getElementById("settle1").remove();
                            document1.getElementById("pass1").remove();
                            document1.getElementById("bill1").remove();
                            document1.getElementById("reward1").remove();
                            document1.getElementById("rewardToday1").remove();

                            document1.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
                            Element user2_user = document1.getElementById("user2_user");
                            user2_user.text("Bonjour " + driver.getFirstName() + " " + driver.getLastName() + "，");
                            Element user2_content = document1.getElementById("user2_content");
                            user2_content.text("Vous avez invité avec succès un utilisateur à s’inscrire à i-go pour recevoir une récompense GHS " + bigDecimal.doubleValue() + ". Veuillez vérifier");
                        }
                        EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense",  document1.html());
                        //开始生成pdf收据和html收据
                        File file = new File("/home/igotechgh/nginx/html/files/html/");
                        if(!file.exists()){
                            file.mkdirs();
                        }
                        String randomString = ToolUtil.getRandomString(10);
                        file = new File("/home/igotechgh/nginx/html/files/html/invitation_" + randomString + ".html");
                        if(!file.exists()){
                            file.createNewFile();
                        }
                        FileWriter fileWriter = new FileWriter(file);
                        fileWriter.write(document1.html());
                        fileWriter.flush();
                        fileWriter.close();

                        String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html";
                        TEmail tEmail = new TEmail();
                        tEmail.setLink(link);
                        tEmail.setUserId(driver.getId());
                        tEmail.setType(2);
                        tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
                        tEmail.setCreateTime(new Date());
                        int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                        tEmail.setWeek(EmailUtil.getWeek(language,i));
                        boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                        if(am){
                            tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                        }else {
                            tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                        }
                        emailService.insert(tEmail);
                        BigDecimal finalBigDecimal = bigDecimal;
                        new Thread(new Runnable() {
                            @Override
                            public void run() {
                                try {
                                    String path1 = templatePath + "driver/index.html";
                                    Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                                    if(1 == language){
                                        document1.getElementById("english").remove();
                                        document1.getElementById("french").remove();
                                        document1.getElementById("invite").remove();
                                        document1.getElementById("settle").remove();
                                        document1.getElementById("pass").remove();
                                        document1.getElementById("bill").remove();
                                        document1.getElementById("reward").remove();
                                        document1.getElementById("rewardToday").remove();
            
                                        document1.getElementsByTag("title").get(0).text("司机奖励通知");
                                        Element user_user = document1.getElementById("user_user");
                                        user_user.text("您好 " + driver.getFirstName() + " " + driver.getLastName() + "，");
                                        Element user_content = document1.getElementById("user_content");
                                        user_content.text("您已成功邀请一位用户注册I-GO，获得奖励GHS " + finalBigDecimal.doubleValue() + "，请查收");
                                    }
                                    if(2 == language){
                                        document1.getElementById("chinese").remove();
                                        document1.getElementById("french").remove();
                                        document1.getElementById("invite1").remove();
                                        document1.getElementById("settle1").remove();
                                        document1.getElementById("pass1").remove();
                                        document1.getElementById("bill1").remove();
                                        document1.getElementById("reward1").remove();
                                        document1.getElementById("rewardToday1").remove();
            
                                        document1.getElementsByTag("title").get(0).text("Reward-driver notice");
                                        Element user1_user = document1.getElementById("user1_user");
                                        user1_user.text("Hello " + driver.getFirstName() + " " + driver.getLastName() + "，");
                                        Element user1_content = document1.getElementById("user1_content");
                                        user1_content.text("You have succeeded to invite a rider to register with I-GO, so you received a GHS " + finalBigDecimal.doubleValue() + " bonus, please check your balance.");
                                    }
                                    if(3 == language){
                                        document1.getElementById("chinese").remove();
                                        document1.getElementById("english").remove();
                                        document1.getElementById("invite1").remove();
                                        document1.getElementById("settle1").remove();
                                        document1.getElementById("pass1").remove();
                                        document1.getElementById("bill1").remove();
                                        document1.getElementById("reward1").remove();
                                        document1.getElementById("rewardToday1").remove();
            
                                        document1.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
                                        Element user2_user = document1.getElementById("user2_user");
                                        user2_user.text("Bonjour " + driver.getFirstName() + " " + driver.getLastName() + "，");
                                        Element user2_content = document1.getElementById("user2_content");
                                        user2_content.text("Vous avez invité avec succès un utilisateur à s’inscrire à i-go pour recevoir une récompense GHS " + finalBigDecimal.doubleValue() + ". Veuillez vérifier");
                                    }
                                    EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense",  document1.html());
                                    //开始生成pdf收据和html收据
                                    File file = new File("/home/igotechgh/nginx/html/files/html/");
                                    if(!file.exists()){
                                        file.mkdirs();
                                    }
                                    String randomString = ToolUtil.getRandomString(10);
                                    file = new File("/home/igotechgh/nginx/html/files/html/invitation_" + randomString + ".html");
                                    if(!file.exists()){
                                        file.createNewFile();
                                    }
                                    FileWriter fileWriter = new FileWriter(file);
                                    fileWriter.write(document1.html());
                                    fileWriter.flush();
                                    fileWriter.close();
        
                                    String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html";
                                    TEmail tEmail = new TEmail();
                                    tEmail.setLink(link);
                                    tEmail.setUserId(driver.getId());
                                    tEmail.setType(2);
                                    tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
                                    tEmail.setCreateTime(new Date());
                                    int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                                    tEmail.setWeek(EmailUtil.getWeek(language,i));
                                    boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                                    if(am){
                                        tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                                    }else {
                                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                                    }
                                    emailService.insert(tEmail);
                                }catch (Exception e){
                                    e.printStackTrace();
                                }
                            }
                        }).start();
                    }
                }

@@ -814,79 +826,92 @@
                        userActivityInviteMapper.updateById(uai);

                        if(ToolUtil.isNotEmpty(userInfo1.getEmail())){
                            String path1 = templatePath +  "user/coupon.html";
                            Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                            if(language == 1){
                                document1.getElementById("english").remove();
                                document1.getElementById("french").remove();
                                document1.getElementsByTag("title").get(0).text("优惠券到账");
                                Element chinese_user = document1.getElementById("chinese_user");
                                chinese_user.text("您好 " + userInfo1.getNickName() + "，");
                                Element chinese_number = document1.getElementById("chinese_number");
                                chinese_number.text("您有" + num + "张优惠券到账");
                                Element chinese_date = document1.getElementById("chinese_date");
                                chinese_date.text("此活动有效期在" + startTime + "至" + endTime + "，详情请查看I-GO平台");
                                Element chinese_remark = document1.getElementById("chinese_remark");
                                chinese_remark.text("注意：满减活动，每单消费至少GHS " + fullMoney + "，才可享用。");
                            }
                            if(language == 2){
                                document1.getElementById("chinese").remove();
                                document1.getElementById("french").remove();
                                document1.getElementsByTag("title").get(0).text("Coupon is in");
                                Element english_user = document1.getElementById("english_user");
                                english_user.text("Hello " + userInfo1.getNickName() + "，");
                                Element english_number = document1.getElementById("english_number");
                                english_number.text("You have received " + num + " coupons");
                                Element english_date = document1.getElementById("english_date");
                                english_date.text("You could use them from " + startTime + " to " + endTime);
                                Element english_remark = document1.getElementById("english_remark");
                                english_remark.text("NB! Coupon is valid only for the trip fare not less than GHS " + fullMoney + " per ride.");
                            }
                            if(language == 3){
                                document1.getElementById("chinese").remove();
                                document1.getElementById("english").remove();
                                document1.getElementsByTag("title").get(0).text("Le coupon est arrivé sur le compte");
                                Element french_user = document1.getElementById("french_user");
                                french_user.text("Cher(ère) " + userInfo1.getNickName() + "，");
                                Element french_number = document1.getElementById("french_number");
                                french_number.text("Vous avez reçu " + num + " coupons.");
                                Element french_date = document1.getElementById("french_date");
                                french_date.text("Vous devriez les utiliser du" + startTime + " au " + endTime + ", voir le détail sur la plate-forme I-GO.");
                                Element french_remark = document1.getElementById("french_remark");
                                french_remark.text("Remarque! Le coupon n'est valable que pour le tarif d'au moins GHS " + fullMoney + " par trajet.");
                            }
                            EmailUtil.send(userInfo1.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte",  document1.html());
                            //开始生成pdf收据和html收据
                            File file = new File("/home/igotechgh/nginx/html/files/html/");
                            if(!file.exists()){
                                file.mkdirs();
                            }
                            String randomString = ToolUtil.getRandomString(10);
                            file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html");
                            if(!file.exists()){
                                file.createNewFile();
                            }
                            FileWriter fileWriter = new FileWriter(file);
                            fileWriter.write(document1.html());
                            fileWriter.flush();
                            fileWriter.close();

                            String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html";
                            TEmail tEmail = new TEmail();
                            tEmail.setLink(link);
                            tEmail.setUserId(uid);
                            tEmail.setType(1);
                            tEmail.setName(language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte");
                            tEmail.setCreateTime(new Date());
                            int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                            tEmail.setWeek(EmailUtil.getWeek(language,i));
                            boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                            if(am){
                                tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                            }else {
                                tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                            }
                            emailService.insert(tEmail);
                            int finalNum = num;
                            String finalStartTime = startTime;
                            String finalEndTime = endTime;
                            double finalFullMoney = fullMoney;
                            new Thread(new Runnable() {
                                @Override
                                public void run() {
                                    try {
                                        String path1 = templatePath +  "user/coupon.html";
                                        Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                                        if(language == 1){
                                            document1.getElementById("english").remove();
                                            document1.getElementById("french").remove();
                                            document1.getElementsByTag("title").get(0).text("优惠券到账");
                                            Element chinese_user = document1.getElementById("chinese_user");
                                            chinese_user.text("您好 " + userInfo1.getNickName() + "，");
                                            Element chinese_number = document1.getElementById("chinese_number");
                                            chinese_number.text("您有" + finalNum + "张优惠券到账");
                                            Element chinese_date = document1.getElementById("chinese_date");
                                            chinese_date.text("此活动有效期在" + finalStartTime + "至" + finalEndTime + "，详情请查看I-GO平台");
                                            Element chinese_remark = document1.getElementById("chinese_remark");
                                            chinese_remark.text("注意：满减活动，每单消费至少GHS " + finalFullMoney + "，才可享用。");
                                        }
                                        if(language == 2){
                                            document1.getElementById("chinese").remove();
                                            document1.getElementById("french").remove();
                                            document1.getElementsByTag("title").get(0).text("Coupon is in");
                                            Element english_user = document1.getElementById("english_user");
                                            english_user.text("Hello " + userInfo1.getNickName() + "，");
                                            Element english_number = document1.getElementById("english_number");
                                            english_number.text("You have received " + finalNum + " coupons");
                                            Element english_date = document1.getElementById("english_date");
                                            english_date.text("You could use them from " + finalStartTime + " to " + finalEndTime);
                                            Element english_remark = document1.getElementById("english_remark");
                                            english_remark.text("NB! Coupon is valid only for the trip fare not less than GHS " + finalFullMoney + " per ride.");
                                        }
                                        if(language == 3){
                                            document1.getElementById("chinese").remove();
                                            document1.getElementById("english").remove();
                                            document1.getElementsByTag("title").get(0).text("Le coupon est arrivé sur le compte");
                                            Element french_user = document1.getElementById("french_user");
                                            french_user.text("Cher(ère) " + userInfo1.getNickName() + "，");
                                            Element french_number = document1.getElementById("french_number");
                                            french_number.text("Vous avez reçu " + finalNum + " coupons.");
                                            Element french_date = document1.getElementById("french_date");
                                            french_date.text("Vous devriez les utiliser du" + finalStartTime + " au " + finalEndTime + ", voir le détail sur la plate-forme I-GO.");
                                            Element french_remark = document1.getElementById("french_remark");
                                            french_remark.text("Remarque! Le coupon n'est valable que pour le tarif d'au moins GHS " + finalFullMoney + " par trajet.");
                                        }
                                        EmailUtil.send(userInfo1.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte",  document1.html());
                                        //开始生成pdf收据和html收据
                                        File file = new File("/home/igotechgh/nginx/html/files/html/");
                                        if(!file.exists()){
                                            file.mkdirs();
                                        }
                                        String randomString = ToolUtil.getRandomString(10);
                                        file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html");
                                        if(!file.exists()){
                                            file.createNewFile();
                                        }
                                        FileWriter fileWriter = new FileWriter(file);
                                        fileWriter.write(document1.html());
                                        fileWriter.flush();
                                        fileWriter.close();
    
                                        String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html";
                                        TEmail tEmail = new TEmail();
                                        tEmail.setLink(link);
                                        tEmail.setUserId(uid);
                                        tEmail.setType(1);
                                        tEmail.setName(language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte");
                                        tEmail.setCreateTime(new Date());
                                        int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                                        tEmail.setWeek(EmailUtil.getWeek(language,i));
                                        boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                                        if(am){
                                            tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                                        }else {
                                            tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                                        }
                                        emailService.insert(tEmail);
                                    }catch (Exception e){
                                        e.printStackTrace();
                                    }
                                }
                            }).start();
                        }

                    }