修改文档bug

Pu Zhibing

9 天以前 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc

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

@@ -34,13 +34,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.*;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -87,6 +85,9 @@

    @Resource
    private DriverMapper driverMapper;
    
    @Autowired
    private DateUtil dateUtil;

    @Resource
    private DriverActivityRegisteredMapper driverActivityRegisteredMapper;
@@ -145,13 +146,14 @@
            redisUtil.setStrValue(phone, authCode, 5 * 60);//设置五分钟过期
            switch (language){
                case 1:
                    sms = "您的验证码为：" + authCode + "，该验证码5分钟内有效，请勿泄漏于他人！";
//                    sms = "您的验证码为：" + authCode + "，该验证码5分钟内有效，请勿泄漏于他人！";
                    sms = "Your verification code is " + authCode + ", it is valid within 5 minutes, please do not reveal it to others.";
                    break;
                case 2:
                    sms = "Your verification code is " + authCode + "，it is valid within 5 minutes, please do not reveal it to others.";
                    sms = "Your verification code is " + authCode + ", it is valid within 5 minutes, please do not reveal it to others.";
                    break;
                case 3:
                    sms = "Votre code de validation est " + authCode + "et il est valide pendant 5 minutes. Veuillez ne pas le révéler à d’autres personnes.";
                    sms = "Votre code de validation est " + authCode + " et il est valide pendant 5 minutes. Veuillez ne pas le révéler à d’autres personnes.";
                    break;
            }
            smsUtil.sendCellulantMessage(phone, sms);
@@ -160,6 +162,11 @@
        return ResultUtil.success();
    }

    
    
    
    
    

    /**
     * 校验短信验证码
@@ -214,7 +221,7 @@

            //用户所属企业
            if(null != lat && null != lng){
                ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lat);
                ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lat, null);
                AddressComponentsVo[] addressComponentsVos = reverseGeocode.getAddressComponentsVos();
                String[] citys = new String[addressComponentsVos.length];
                for (int i = 0; i < addressComponentsVos.length; i++) {
@@ -265,12 +272,12 @@
                }
                EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès",  document.html());
                //开始生成pdf收据和html收据
                File file = new File("/usr/local/nginx/html/files/html/");
                File file = new File("/home/igotechgh/nginx/html/files/html/");
                if(!file.exists()){
                    file.mkdirs();
                }
                String randomString = ToolUtil.getRandomString(10);
                file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html");
                file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html");
                if(!file.exists()){
                    file.createNewFile();
                }
@@ -279,7 +286,7 @@
                fileWriter.flush();
                fileWriter.close();

                String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
                String link ="https://igo.i-go.group/files/html/registration_" + randomString + ".html";
                TEmail tEmail = new TEmail();
                tEmail.setLink(link);
                tEmail.setUserId(uid);
@@ -301,14 +308,18 @@
            if(null != uid){
                if(type == 2){//司机分享
                    Driver driver = driverMapper.selectById(uid);
                    List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
                    Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
                    //邀请用户注册
                    List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(uid, 2, 1, date.get("startTime"), date.get("endTime"));
                    BigDecimal bigDecimal = new BigDecimal("0");
                    for(Map<String, Object> map : query){
                        if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
                            bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
                            incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));
                        }
                    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());
                    driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                    driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -367,12 +378,12 @@
                        }
                        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("/usr/local/nginx/html/files/html/");
                        File file = new File("/home/igotechgh/nginx/html/files/html/");
                        if(!file.exists()){
                            file.mkdirs();
                        }
                        String randomString = ToolUtil.getRandomString(10);
                        file = new File("/usr/local/nginx/html/files/html/invitation_" + randomString + ".html");
                        file = new File("/home/igotechgh/nginx/html/files/html/invitation_" + randomString + ".html");
                        if(!file.exists()){
                            file.createNewFile();
                        }
@@ -381,7 +392,7 @@
                        fileWriter.flush();
                        fileWriter.close();

                        String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html";
                        String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html";
                        TEmail tEmail = new TEmail();
                        tEmail.setLink(link);
                        tEmail.setUserId(driver.getId());
@@ -495,12 +506,12 @@
                            }
                            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("/usr/local/nginx/html/files/html/");
                            File file = new File("/home/igotechgh/nginx/html/files/html/");
                            if(!file.exists()){
                                file.mkdirs();
                            }
                            String randomString = ToolUtil.getRandomString(10);
                            file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
                            file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html");
                            if(!file.exists()){
                                file.createNewFile();
                            }
@@ -509,7 +520,7 @@
                            fileWriter.flush();
                            fileWriter.close();

                            String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
                            String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html";
                            TEmail tEmail = new TEmail();
                            tEmail.setLink(link);
                            tEmail.setUserId(uid);
@@ -615,12 +626,12 @@
                }
                EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès",  document.html());
                //开始生成pdf收据和html收据
                File file = new File("/usr/local/nginx/html/files/html/");
                File file = new File("/home/igotechgh/nginx/html/files/html/");
                if(!file.exists()){
                    file.mkdirs();
                }
                String randomString = ToolUtil.getRandomString(10);
                file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html");
                file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html");
                if(!file.exists()){
                    file.createNewFile();
                }
@@ -629,7 +640,7 @@
                fileWriter.flush();
                fileWriter.close();

                String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
                String link ="https://igo.i-go.group/files/html/registration_" + randomString + ".html";
                TEmail tEmail = new TEmail();
                tEmail.setLink(link);
                tEmail.setUserId(uid);
@@ -651,19 +662,15 @@
            if(null != uid){
                if(type == 2){//司机分享
                    Driver driver = driverMapper.selectById(uid);
                    List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
                    Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
                    //邀请用户注册
                    List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(uid, 2, 1, date.get("startTime"), date.get("endTime"));
                    BigDecimal bigDecimal = new BigDecimal("0");
                    for(Map<String, Object> map : query){
                        if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
                            bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
                            incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));
                        }
                        DriverActivityHistory dah = new DriverActivityHistory();
                        dah.setActivityId(Integer.valueOf(map.get("id").toString()));
                        dah.setDriverId(uid);
                        dah.setType(2);
                        DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectOne(dah);
                    for (DriverActivityHistory driverActivityHistory : list) {
                        bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
                        incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
                        driverActivityHistory.setCarryOut(2);
                        driverActivityHistory.setCompletionTime(new Date());
                        driverActivityHistoryMapper.updateById(driverActivityHistory);
                    }
                    driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -672,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("/usr/local/nginx/html/files/html/");
                        if(!file.exists()){
                            file.mkdirs();
                        }
                        String randomString = ToolUtil.getRandomString(10);
                        file = new File("/usr/local/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 ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html";
                        TEmail tEmail = new TEmail();
                        tEmail.setLink(link);
                        tEmail.setUserId(driver.getId());
                        tEmail.setType(2);
                        tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
                        tEmail.setCreateTime(new Date());
                        int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                        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();
                    }
                }

@@ -809,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("/usr/local/nginx/html/files/html/");
                            if(!file.exists()){
                                file.mkdirs();
                            }
                            String randomString = ToolUtil.getRandomString(10);
                            file = new File("/usr/local/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 ="http://182.160.16.251:81/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();
                        }

                    }
@@ -1041,12 +1071,12 @@
                }
                EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès",  document.html());
                //开始生成pdf收据和html收据
                File file = new File("/usr/local/nginx/html/files/html/");
                File file = new File("/home/igotechgh/nginx/html/files/html/");
                if(!file.exists()){
                    file.mkdirs();
                }
                String randomString = ToolUtil.getRandomString(10);
                file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html");
                file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html");
                if(!file.exists()){
                    file.createNewFile();
                }
@@ -1055,7 +1085,7 @@
                fileWriter.flush();
                fileWriter.close();

                String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
                String link ="https://igo.i-go.group/files/html/registration_" + randomString + ".html";
                TEmail tEmail = new TEmail();
                tEmail.setLink(link);
                tEmail.setUserId(uid);
@@ -1189,12 +1219,12 @@

                    EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte",  document1.html());
                    //开始生成pdf收据和html收据
                    File file = new File("/usr/local/nginx/html/files/html/");
                    File file = new File("/home/igotechgh/nginx/html/files/html/");
                    if(!file.exists()){
                        file.mkdirs();
                    }
                    String randomString = ToolUtil.getRandomString(10);
                    file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
                    file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }
@@ -1203,7 +1233,7 @@
                    fileWriter.flush();
                    fileWriter.close();

                    String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
                    String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html";
                    TEmail tEmail = new TEmail();
                    tEmail.setLink(link);
                    tEmail.setUserId(uid);
@@ -1298,7 +1328,7 @@
            }
            //用户所属企业
            if(null != lat && null != lng){
                ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lng);
                ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lng, null);
                if(null != reverseGeocode){
                    AddressComponentsVo[] addressComponentsVos = reverseGeocode.getAddressComponentsVos();
                    String[] citys = new String[addressComponentsVos.length];
@@ -1339,12 +1369,12 @@
                }
                EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès",  document.html());
                //开始生成pdf收据和html收据
                File file = new File("/usr/local/nginx/html/files/html/");
                File file = new File("/home/igotechgh/nginx/html/files/html/");
                if(!file.exists()){
                    file.mkdirs();
                }
                String randomString = ToolUtil.getRandomString(10);
                file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html");
                file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html");
                if(!file.exists()){
                    file.createNewFile();
                }
@@ -1353,7 +1383,7 @@
                fileWriter.flush();
                fileWriter.close();

                String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
                String link ="https://igo.i-go.group/files/html/registration_" + randomString + ".html";
                TEmail tEmail = new TEmail();
                tEmail.setLink(link);
                tEmail.setUserId(uid);
@@ -1484,12 +1514,12 @@
                    }
                    EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte",  document1.html());
                    //开始生成pdf收据和html收据
                    File file = new File("/usr/local/nginx/html/files/html/");
                    File file = new File("/home/igotechgh/nginx/html/files/html/");
                    if(!file.exists()){
                        file.mkdirs();
                    }
                    String randomString = ToolUtil.getRandomString(10);
                    file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
                    file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }
@@ -1498,7 +1528,7 @@
                    fileWriter.flush();
                    fileWriter.close();

                    String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
                    String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html";
                    TEmail tEmail = new TEmail();
                    tEmail.setLink(link);
                    tEmail.setUserId(uid);
@@ -1576,8 +1606,8 @@
            userInfo1.setSex(userInfo.getSex());
            userInfo1.setNickName(userInfo.getNickName());
            this.updateById(userInfo1);

            this.deleteById(userInfo.getId());//删除原有数据
            userInfo.setFlag(3);
            this.updateById(userInfo);//删除原有数据
            //还原之前账号领取的注册优惠券
            List<UserCouponRecord> list = userCouponRecordService.selectList(new EntityWrapper<UserCouponRecord>().eq("userId", userInfo.getId()));
            for(UserCouponRecord ucr : list){
@@ -1692,6 +1722,9 @@
    @Override
    public Map<String, Object> queryUser(Integer language, String phone) throws Exception {
        Map<String, Object> map = userInfoMapper.queryUserInfo(null, phone);
        if(null == map){
            return null;
        }
        if(null != map.get("birthday")){
            String birthday = map.get("birthday").toString();
            map.put("birthday", DateUtil.conversionFormat(language, birthday));
@@ -1724,6 +1757,9 @@
    @Override
    public ResultUtil depositBalance(Integer payType, String bankCardId, Double money, Integer uid, Integer type, Integer language) throws Exception {
        UserInfo userInfo = userInfoMapper.selectById(uid);
        if(ToolUtil.isEmpty(userInfo.getPhone())){
            return ResultUtil.error(language == 1 ? "请先绑定手机号码" : language == 2 ? "Please bind your mobile phone number first." : "Veuillez d’abord vous inscrire en liant votre numéro de téléphone portable.");
        }
        if(money.compareTo(0D) <= 0){
            return ResultUtil.error(language == 1 ? "支付金额必须大于0元" : language == 2 ? "Payment amount must be greater than zero." : "Le montant du paiement doit être supérieur à zéro.", "");
        }
@@ -1743,8 +1779,8 @@
            checkoutRequest.setRequestDescription("Account top-up");
            checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelUserBalance");
            checkoutRequest.setPendingRedirectUrl("");
            checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
            checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
            checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
            checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
            return TinggPayUtil.checkoutRequest(checkoutRequest);
        }

@@ -1764,8 +1800,8 @@
            checkoutRequest.setRequestDescription("Account top-up");
            checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelUserBalance");
            checkoutRequest.setPendingRedirectUrl("");
            checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
            checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
            checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
            checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
            return TinggPayUtil.checkoutRequest(checkoutRequest);
        }
        return ResultUtil.success("");
@@ -1838,12 +1874,12 @@

            EmailUtil.send(userInfo.getEmail(), language == 1 ? "重置密码" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe",  document.html());
            //开始生成pdf收据和html收据
            File file = new File("/usr/local/nginx/html/files/html/");
            File file = new File("/home/igotechgh/nginx/html/files/html/");
            if(!file.exists()){
                file.mkdirs();
            }
            String randomString = ToolUtil.getRandomString(10);
            file = new File("/usr/local/nginx/html/files/html/password_" + randomString + ".html");
            file = new File("/home/igotechgh/nginx/html/files/html/password_" + randomString + ".html");
            if(!file.exists()){
                file.createNewFile();
            }
@@ -1852,7 +1888,7 @@
            fileWriter.flush();
            fileWriter.close();

            String link ="http://182.160.16.251:81/files/html/password_" + randomString + ".html";
            String link ="https://igo.i-go.group/files/html/password_" + randomString + ".html";
            TEmail tEmail = new TEmail();
            tEmail.setLink(link);
            tEmail.setUserId(uid);
@@ -1939,7 +1975,7 @@
        UserInfo userInfo = this.selectById(query.getUserId());
        if(null != query){
            //添加交易明细
            transactionDetailsService.saveData(Integer.valueOf(query.getUserId()), "余额充值", query.getAmount(), 2, 1, 1, 5, null);
            transactionDetailsService.saveData(Integer.valueOf(query.getUserId()), "余额充值", query.getAmount(), 2, 1, 1, 5, paymentRecordId);
            double v = new BigDecimal(userInfo.getBalance()).add(new BigDecimal(query.getAmount())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
            userInfo.setBalance(v);
            this.updateById(userInfo);
@@ -1975,13 +2011,9 @@
            String endTime = "";
            if(null != map.get("startTime")){
                startTime = map.get("startTime").toString();
                map.put("startTime", DateUtil.conversionFormat(language, startTime));
                startTime = DateUtil.conversionFormat(language, startTime);
            }
            if(null != map.get("endTime")){
                endTime = map.get("endTime").toString();
                map.put("endTime", DateUtil.conversionFormat(language, endTime));
                endTime = DateUtil.conversionFormat(language, endTime);
            }
            double fullMoney = 0;
            if(null != map.get("bcompanyId")){
@@ -2150,18 +2182,18 @@
                        Element french_number = document1.getElementById("french_number");
                        french_number.text("Vous avez reçu " + list.size() + " 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.");
                        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(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte",  document1.html());
                    //开始生成pdf收据和html收据
                    File file = new File("/usr/local/nginx/html/files/html/");
                    File file = new File("/home/igotechgh/nginx/html/files/html/");
                    if(!file.exists()){
                        file.mkdirs();
                    }
                    String randomString = ToolUtil.getRandomString(10);
                    file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
                    file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }
@@ -2170,7 +2202,7 @@
                    fileWriter.flush();
                    fileWriter.close();

                    String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
                    String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html";
                    TEmail tEmail = new TEmail();
                    tEmail.setLink(link);
                    tEmail.setUserId(userInfo.getId());
@@ -2279,7 +2311,7 @@
                uar.setLavePrice(new BigDecimal(lavePrice).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                userActivityRegisteredService.updateById(uar);

                if(ToolUtil.isNotEmpty(userInfo.getEmail())){
                if(0 < num && ToolUtil.isNotEmpty(userInfo.getEmail())){
                    String path1 = templatePath +  "user/coupon.html";
                    Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                    if(language == 1){
@@ -2317,18 +2349,18 @@
                        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.");
                        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(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte",  document1.html());
                    //开始生成pdf收据和html收据
                    File file = new File("/usr/local/nginx/html/files/html/");
                    File file = new File("/home/igotechgh/nginx/html/files/html/");
                    if(!file.exists()){
                        file.mkdirs();
                    }
                    String randomString = ToolUtil.getRandomString(10);
                    file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
                    file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }
@@ -2337,7 +2369,7 @@
                    fileWriter.flush();
                    fileWriter.close();

                    String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
                    String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html";
                    TEmail tEmail = new TEmail();
                    tEmail.setLink(link);
                    tEmail.setUserId(userInfo.getId());