修改bug

Pu Zhibing

10 小时以前 821fc2f632f8b974a2c0fc37630e13c5fbe6086c

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

@@ -272,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("/home/igotechgh/nginx/html/files/html/");
                File file = new File("/data/nginx/html/files/html/");
                if(!file.exists()){
                    file.mkdirs();
                }
                String randomString = ToolUtil.getRandomString(10);
                file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html");
                file = new File("/data/nginx/html/files/html/registration_" + randomString + ".html");
                if(!file.exists()){
                    file.createNewFile();
                }
@@ -320,94 +320,96 @@
                        driverActivityHistoryMapper.updateById(driverActivityHistory);
                    }
                    
                    driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                    driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                    driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                    driverMapper.updateById(driver);

                    if(ToolUtil.isNotEmpty(driver.getEmail())){
                        String 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(bigDecimal.compareTo(BigDecimal.ZERO) > 0){
                        driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                        driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                        driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                        driverMapper.updateById(driver);
        
                        if(ToolUtil.isNotEmpty(driver.getEmail())){
                            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("/data/nginx/html/files/html/");
                            if(!file.exists()){
                                file.mkdirs();
                            }
                            String randomString = ToolUtil.getRandomString(10);
                            file = new File("/data/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);
                        }
                        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);
                    }
                }

@@ -506,12 +508,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("/home/igotechgh/nginx/html/files/html/");
                            File file = new File("/data/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");
                            file = new File("/data/nginx/html/files/html/coupon_" + randomString + ".html");
                            if(!file.exists()){
                                file.createNewFile();
                            }
@@ -626,12 +628,12 @@
                }
                EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès",  document.html());
                //开始生成pdf收据和html收据
                File file = new File("/home/igotechgh/nginx/html/files/html/");
                File file = new File("/data/nginx/html/files/html/");
                if(!file.exists()){
                    file.mkdirs();
                }
                String randomString = ToolUtil.getRandomString(10);
                file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html");
                file = new File("/data/nginx/html/files/html/registration_" + randomString + ".html");
                if(!file.exists()){
                    file.createNewFile();
                }
@@ -737,12 +739,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("/home/igotechgh/nginx/html/files/html/");
                                        File file = new File("/data/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");
                                        file = new File("/data/nginx/html/files/html/invitation_" + randomString + ".html");
                                        if(!file.exists()){
                                            file.createNewFile();
                                        }
@@ -879,12 +881,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("/home/igotechgh/nginx/html/files/html/");
                                        File file = new File("/data/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");
                                        file = new File("/data/nginx/html/files/html/coupon_" + randomString + ".html");
                                        if(!file.exists()){
                                            file.createNewFile();
                                        }
@@ -1090,12 +1092,12 @@
                }
                EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès",  document.html());
                //开始生成pdf收据和html收据
                File file = new File("/home/igotechgh/nginx/html/files/html/");
                File file = new File("/data/nginx/html/files/html/");
                if(!file.exists()){
                    file.mkdirs();
                }
                String randomString = ToolUtil.getRandomString(10);
                file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html");
                file = new File("/data/nginx/html/files/html/registration_" + randomString + ".html");
                if(!file.exists()){
                    file.createNewFile();
                }
@@ -1238,12 +1240,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("/home/igotechgh/nginx/html/files/html/");
                    File file = new File("/data/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");
                    file = new File("/data/nginx/html/files/html/coupon_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }
@@ -1388,12 +1390,12 @@
                }
                EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès",  document.html());
                //开始生成pdf收据和html收据
                File file = new File("/home/igotechgh/nginx/html/files/html/");
                File file = new File("/data/nginx/html/files/html/");
                if(!file.exists()){
                    file.mkdirs();
                }
                String randomString = ToolUtil.getRandomString(10);
                file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html");
                file = new File("/data/nginx/html/files/html/registration_" + randomString + ".html");
                if(!file.exists()){
                    file.createNewFile();
                }
@@ -1533,12 +1535,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("/home/igotechgh/nginx/html/files/html/");
                    File file = new File("/data/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");
                    file = new File("/data/nginx/html/files/html/coupon_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }
@@ -1893,12 +1895,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("/home/igotechgh/nginx/html/files/html/");
            File file = new File("/data/nginx/html/files/html/");
            if(!file.exists()){
                file.mkdirs();
            }
            String randomString = ToolUtil.getRandomString(10);
            file = new File("/home/igotechgh/nginx/html/files/html/password_" + randomString + ".html");
            file = new File("/data/nginx/html/files/html/password_" + randomString + ".html");
            if(!file.exists()){
                file.createNewFile();
            }
@@ -2207,12 +2209,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("/home/igotechgh/nginx/html/files/html/");
                    File file = new File("/data/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");
                    file = new File("/data/nginx/html/files/html/coupon_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }
@@ -2374,12 +2376,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("/home/igotechgh/nginx/html/files/html/");
                    File file = new File("/data/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");
                    file = new File("/data/nginx/html/files/html/coupon_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }