From 8128a2a50a27d2aca3cb8b4d91acb8a802d86788 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 15 十二月 2023 14:45:45 +0800 Subject: [PATCH] 更新接口 --- DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 441 ++++++++++++++++++++++++++++++++---------------------- 1 files changed, 260 insertions(+), 181 deletions(-) diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java index 014223d..fb57212 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java @@ -243,7 +243,7 @@ document.getElementById("driverAudit").remove(); document.getElementById("carAudit").remove(); - document.getElementsByTag("title").get(0).text("验证码"); + document.getElementsByTag("title").get(0).text("邮箱验证"); Element email_user = document.getElementById("email_user"); email_user.text("您好 ,"); Element email_content = document.getElementById("email_content"); @@ -287,7 +287,7 @@ Element email2_content = document.getElementById("email2_content"); email2_content.text("Le code de ramassage de votre colis est " + authCode + ", veuillez effectuer la verification dans les 5minutes."); } - EmailUtil.send(email, language == 1 ? "验证码" : language == 2 ? "Verification code" : "Code de validation", document.html()); + EmailUtil.send(email, language == 1 ? "邮箱验证" : language == 2 ? "Verification code" : "Code de validation", document.html()); return ResultUtil.success(); } @@ -319,8 +319,9 @@ */ @Override public ResultUtil registeredDriver(String phoneOperator, String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language) throws Exception { + Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据 ResultUtil<LoginWarpper> result = this.registeredDriver(phoneOperator, phone, code, password,uid,type, language); - if(result.getCode() == 200 && null != uid){ + if(null == driver1 && result.getCode() == 200 && null != uid){ if(type == 2){ Driver driver = driverMapper.selectById(uid); List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId()); @@ -352,7 +353,7 @@ document.getElementById("driverAudit").remove(); document.getElementById("carAudit").remove(); - document.getElementsByTag("title").get(0).text("邀请奖励"); + 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"); @@ -371,7 +372,7 @@ document.getElementById("driverAudit1").remove(); document.getElementById("carAudit1").remove(); - document.getElementsByTag("title").get(0).text("Invite and earn"); + 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"); @@ -390,13 +391,13 @@ document.getElementById("driverAudit2").remove(); document.getElementById("carAudit2").remove(); - document.getElementsByTag("title").get(0).text("Invitez et récompensez"); + 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 ? "Invite and earn" : "Invitez et récompensez", document.html()); + EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -411,24 +412,13 @@ fileWriter.write(document.html()); fileWriter.flush(); fileWriter.close(); - FileInputStream fileInputStream = new FileInputStream(file); - File file1 = new File("/usr/local/nginx/html/files/pdf/"); - if(!file1.exists()){ - file1.mkdirs(); - } - file1 = new File("/usr/local/nginx/html/files/pdf/invitation_" + randomString + ".pdf"); - if(!file1.exists()){ - file1.createNewFile(); - } - FileOutputStream fileOutputStream = new FileOutputStream(file1); - HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); 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 ? "Invite and earn" : "Invitez et récompensez"); + 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); @@ -471,6 +461,194 @@ } } return result; + } + + + + + + + + + /** + * 司机提交注册申请 + * @throws Exception + */ + @Override + public ResultUtil registeredDriver1(String phoneOperator, String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language) throws Exception { + boolean b = this.checkCaptcha("", phone, code); + if(!b){ + return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide"); + } + Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据 + if(null != driver1){ + driver1.setAuthState(1); + driverMapper.updateById(driver1); + return ResultUtil.success(); + } + + driver1 = driverMapper.queryByPhone(phone); + if(null != driver1){ + return ResultUtil.error(language == 1 ? "手机号已被注册" : language == 2 ? "The mobile phone number has been registered" : "Le numéro de téléphone portable a été enregistré"); + } + Driver driver = new Driver(); + driver.setAccount(phone); + driver.setJobNumber(getCode()); + driver.setPhoneOperator(phoneOperator); + driver.setPhone(phone); + driver.setPassword(ShiroKit.md5(password, salt)); + driver.setAuthState(1); + driver.setState(1); + driver.setInsertTime(new Date()); + driver.setAddType(1); + driver.setBalance(0D); + if(null!=uid){ + driver.setUid(uid); + } + if(null!=type){ + driver.setuType(type); + } + this.insert(driver); + if(null != uid){ + if(type == 2){ + driver = driverMapper.selectById(uid); + List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId()); + 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")))); + } + } + driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); + driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); + driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); + driverMapper.updateById(driver); + + if(ToolUtil.isNotEmpty(driver.getEmail())){ + String path = templatePath + "driver/index.html"; + Document document = Jsoup.parse(new File(path), "UTF-8"); + if(1 == language){ + document.getElementById("english").remove(); + document.getElementById("french").remove(); + document.getElementById("user").remove(); + document.getElementById("settle").remove(); + document.getElementById("pass").remove(); + document.getElementById("email").remove(); + document.getElementById("bill").remove(); + document.getElementById("reward").remove(); + document.getElementById("rewardToday").remove(); + document.getElementById("driverAudit").remove(); + document.getElementById("carAudit").remove(); + + document.getElementsByTag("title").get(0).text("司机奖励通知"); + Element invite_user = document.getElementById("invite_user"); + invite_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ","); + Element invite_content = document.getElementById("invite_content"); + invite_content.text("您已成功邀请一位司机注册I-GO,获得奖励GHS " + bigDecimal.doubleValue() + ",请查收"); + } + if(2 == language){ + document.getElementById("chinese").remove(); + document.getElementById("french").remove(); + document.getElementById("user1").remove(); + document.getElementById("settle1").remove(); + document.getElementById("pass1").remove(); + document.getElementById("email1").remove(); + document.getElementById("bill1").remove(); + document.getElementById("reward1").remove(); + document.getElementById("rewardToday1").remove(); + document.getElementById("driverAudit1").remove(); + document.getElementById("carAudit1").remove(); + + document.getElementsByTag("title").get(0).text("Reward-driver notice"); + Element invite1_user = document.getElementById("invite1_user"); + invite1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ","); + Element invite1_content = document.getElementById("invite1_content"); + invite1_content.text("You have succeeded to invite a driver to register with I-GO, so you received a GHS " + bigDecimal.doubleValue() + " bonus, please check your balance."); + } + if(3 == language){ + document.getElementById("chinese").remove(); + document.getElementById("english").remove(); + document.getElementById("user2").remove(); + document.getElementById("settle2").remove(); + document.getElementById("pass2").remove(); + document.getElementById("email2").remove(); + document.getElementById("bill2").remove(); + document.getElementById("reward2").remove(); + document.getElementById("rewardToday2").remove(); + document.getElementById("driverAudit2").remove(); + document.getElementById("carAudit2").remove(); + + document.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense"); + Element invite2_user = document.getElementById("invite2_user"); + invite2_user.text("Bonjour " + driver.getFirstName() + " " + driver.getLastName() + ","); + Element invite2_content = document.getElementById("invite2_content"); + invite2_content.text("Vous avez invité avec succès un conducteur à s’inscrire à i-go pour recevoir une récompense GHS " + bigDecimal.doubleValue() + ". Veuillez vérifier"); + } + EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document.html()); + String randomString = ToolUtil.getRandomString(10); + //开始生成pdf收据和html收据 + File file = new File("/usr/local/nginx/html/files/html/"); + if(!file.exists()){ + file.mkdirs(); + } + file = new File("/usr/local/nginx/html/files/html/invitation_" + randomString + ".html"); + if(!file.exists()){ + file.createNewFile(); + } + FileWriter fileWriter = new FileWriter(file); + fileWriter.write(document.html()); + fileWriter.flush(); + fileWriter.close(); + + String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html"; + TEmail tEmail = new TEmail(); + tEmail.setLink(link); + tEmail.setUserId(driver.getId()); + tEmail.setType(2); + tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense"); + tEmail.setCreateTime(new Date()); + int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; + String week = EmailUtil.getWeek(language, i); + tEmail.setWeek(week); + boolean am = cn.hutool.core.date.DateUtil.isAM(new Date()); + if(am){ + tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée"); + }else { + tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi"); + } + emailService.insert(tEmail); + } + + } + if(type == 1){//用户分享 + UserInfo userInfo = userInfoMapper.selectById(uid); + List<Map<String, Object>> query = userActivityInviteMapper.query(userInfo.getCompanyId()); + Date date = new Date(); + for(Map<String, Object> map : query){ + for(int i = Integer.valueOf(String.valueOf(map.get("totalNum"))); i > 0; i--){ + UserCouponRecord userCouponRecord = new UserCouponRecord(); + userCouponRecord.setActivityType(3); + userCouponRecord.setCouponActivityId(Integer.valueOf(String.valueOf(map.get("id")))); + userCouponRecord.setCouponId(Integer.valueOf(String.valueOf(map.get("couponId")))); + userCouponRecord.setState(1); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + Integer.valueOf(String.valueOf(map.get("effective")))); + userCouponRecord.setExpirationTime(calendar.getTime()); + userCouponRecord.setCouponType(Integer.valueOf(String.valueOf(map.get("couponType")))); + userCouponRecord.setCouponUseType(Integer.valueOf(String.valueOf(map.get("couponUseType")))); + userCouponRecord.setInsertTime(date); + userCouponRecord.setFullMoney(Double.valueOf(String.valueOf(map.get("fullMoney")))); + userCouponRecord.setMoney(Double.valueOf(String.valueOf(map.get("money")))); + userCouponRecord.setCompanyId(userInfo.getCompanyId()); + userCouponRecord.setUserId(uid); + userCouponRecordMapper.insert(userCouponRecord); + } + } + } + } + return ResultUtil.success(); } @@ -636,7 +814,7 @@ document1.getElementById("driverAudit").remove(); document1.getElementById("carAudit").remove(); - document1.getElementsByTag("title").get(0).text("注册成功"); + document1.getElementsByTag("title").get(0).text("成功注册"); Element settle_user = document1.getElementById("settle_user"); settle_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ","); } @@ -674,7 +852,7 @@ Element settle2_user = document1.getElementById("settle2_user"); settle2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); } - EmailUtil.send(driver.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès", document1.html()); + EmailUtil.send(driver.getEmail(), language == 1 ? "成功注册" : language == 2 ? "Registered successfully" : "Enregistré avec succès", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -689,24 +867,13 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); - FileInputStream fileInputStream = new FileInputStream(file); - File file1 = new File("/usr/local/nginx/html/files/pdf/"); - if(!file1.exists()){ - file1.mkdirs(); - } - file1 = new File("/usr/local/nginx/html/files/pdf/registration_" + randomString + ".pdf"); - if(!file1.exists()){ - file1.createNewFile(); - } - FileOutputStream fileOutputStream = new FileOutputStream(file1); - HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); tEmail.setType(2); - tEmail.setName(language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès"); + tEmail.setName(language == 1 ? "成功注册" : language == 2 ? "Registered successfully" : "Enregistré avec succès"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; String week = EmailUtil.getWeek(language, i); @@ -761,7 +928,7 @@ document1.getElementById("driverAudit").remove(); document1.getElementById("carAudit").remove(); - document1.getElementsByTag("title").get(0).text("重置密码"); + document1.getElementsByTag("title").get(0).text("密码重置"); Element pass_user = document1.getElementById("pass_user"); pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ","); } @@ -799,7 +966,7 @@ Element pass2_user = document1.getElementById("pass2_user"); pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); } - EmailUtil.send(driver.getEmail(), language == 1 ? "重置密码" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document1.html()); + EmailUtil.send(driver.getEmail(), language == 1 ? "密码重置" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -814,24 +981,13 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); - FileInputStream fileInputStream = new FileInputStream(file); - File file1 = new File("/usr/local/nginx/html/files/pdf/"); - if(!file1.exists()){ - file1.mkdirs(); - } - file1 = new File("/usr/local/nginx/html/files/pdf/reset_" + randomString + ".pdf"); - if(!file1.exists()){ - file1.createNewFile(); - } - FileOutputStream fileOutputStream = new FileOutputStream(file1); - HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/reset_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); tEmail.setType(2); - tEmail.setName(language == 1 ? "重置密码" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe"); + tEmail.setName(language == 1 ? "密码重置" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; String week = EmailUtil.getWeek(language, i); @@ -1283,7 +1439,7 @@ document1.getElementById("driverAudit").remove(); document1.getElementById("carAudit").remove(); - document1.getElementsByTag("title").get(0).text("重置密码"); + document1.getElementsByTag("title").get(0).text("密码重置"); Element pass_user = document1.getElementById("pass_user"); pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ","); } @@ -1321,7 +1477,7 @@ Element pass2_user = document1.getElementById("pass2_user"); pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); } - EmailUtil.send(driver.getEmail(), language == 1 ? "重置密码" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document1.html()); + EmailUtil.send(driver.getEmail(), language == 1 ? "密码重置" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -1336,24 +1492,13 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); - FileInputStream fileInputStream = new FileInputStream(file); - File file1 = new File("/usr/local/nginx/html/files/pdf/"); - if(!file1.exists()){ - file1.mkdirs(); - } - file1 = new File("/usr/local/nginx/html/files/pdf/reset_" + randomString + ".pdf"); - if(!file1.exists()){ - file1.createNewFile(); - } - FileOutputStream fileOutputStream = new FileOutputStream(file1); - HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/reset_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); tEmail.setType(2); - tEmail.setName(language == 1 ? "重置密码" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe"); + tEmail.setName(language == 1 ? "密码重置" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; String week = EmailUtil.getWeek(language, i); @@ -1646,13 +1791,13 @@ document1.getElementById("driverAudit").remove(); document1.getElementById("carAudit").remove(); - document1.getElementsByTag("title").get(0).text("今日活动"); + document1.getElementsByTag("title").get(0).text("邀请司机奖励(活动)"); Element rewardToday_user = document1.getElementById("rewardToday_user"); rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ","); Element rewardToday_award = document1.getElementById("rewardToday_award"); rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney()); Element rewardToday_content = document1.getElementById("rewardToday_content"); - rewardToday_content.text("邀请司机注册即可获得奖励。 注意此活动是有时间限制的,详情请查看I-GO平台。"); + rewardToday_content.text("邀请司机注册即可获得奖励。\n注意此活动是有时间限制的,详情请查看I-GO平台。"); } if (2 == language) { document1.getElementById("chinese").remove(); @@ -1667,13 +1812,13 @@ document1.getElementById("driverAudit1").remove(); document1.getElementById("carAudit1").remove(); - document1.getElementsByTag("title").get(0).text("Today's activities"); + document1.getElementsByTag("title").get(0).text("Invite drivers and earn"); Element rewardToday1_user = document1.getElementById("rewardToday1_user"); rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ","); Element rewardToday1_award = document1.getElementById("rewardToday1_award"); rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS"); Element rewardToday1_content = document1.getElementById("rewardToday1_content"); - rewardToday1_content.text("Invite drivers to register and get event rewards. Note that this event is time-limited, please check the I-GO platform for details."); + rewardToday1_content.text("Get a bonus on I-GO today.\nInvite drivers to register to get the bonus.\nNote that this is a limited-time offer. Check your app for more details."); } if (3 == language) { document1.getElementById("chinese").remove(); @@ -1688,15 +1833,15 @@ document1.getElementById("driverAudit2").remove(); document1.getElementById("carAudit2").remove(); - document1.getElementsByTag("title").get(0).text("Activités du jour"); + document1.getElementsByTag("title").get(0).text("Invitez des chauffeurs et gagnez de l’argent"); Element rewardToday2_user = document1.getElementById("rewardToday2_user"); - rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); + rewardToday2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + ","); Element rewardToday2_award = document1.getElementById("rewardToday2_award"); rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney()); Element rewardToday2_content = document1.getElementById("rewardToday2_content"); - rewardToday2_content.text("Invitez les conducteurs à s’inscrire et à recevoir des récompenses. Notez que cet événement est limité dans le temps, veuillez consulter la plateforme I-GO pour plus de détails."); + rewardToday2_content.text("Obtenez un bonus sur I-GO dès aujourd’hui.\nInvitez les chauffeurs à s’inscrire pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails."); } - EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour", document1.html()); + EmailUtil.send(driver.getEmail(), language == 1 ? "邀请司机奖励(活动)" : language == 2 ? "Invite drivers and earn" : "Invitez des chauffeurs et gagnez de l’argent", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -1711,24 +1856,13 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); - FileInputStream fileInputStream = new FileInputStream(file); - File file1 = new File("/usr/local/nginx/html/files/pdf/"); - if(!file1.exists()){ - file1.mkdirs(); - } - file1 = new File("/usr/local/nginx/html/files/pdf/activity_" + randomString + ".pdf"); - if(!file1.exists()){ - file1.createNewFile(); - } - FileOutputStream fileOutputStream = new FileOutputStream(file1); - HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); tEmail.setType(2); - tEmail.setName(language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour"); + tEmail.setName(language == 1 ? "邀请司机奖励(活动)" : language == 2 ? "Invite drivers and earn" : "Invitez des chauffeurs et gagnez de l’argent"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; String week = EmailUtil.getWeek(language, i); @@ -1773,13 +1907,13 @@ document1.getElementById("driverAudit").remove(); document1.getElementById("carAudit").remove(); - document1.getElementsByTag("title").get(0).text("今日活动"); + document1.getElementsByTag("title").get(0).text("邀请用户奖励(活动)"); Element rewardToday_user = document1.getElementById("rewardToday_user"); rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ","); Element rewardToday_award = document1.getElementById("rewardToday_award"); rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney()); Element rewardToday_content = document1.getElementById("rewardToday_content"); - rewardToday_content.text("邀请用户注册即可活动奖励。 注意此活动是有时间限制的,详情请查看I-GO平台。"); + rewardToday_content.text("邀请用户注册即可获得奖励。\n 注意此活动是有时间限制的,详情请查看I-GO平台。"); } if (2 == language) { document1.getElementById("chinese").remove(); @@ -1794,13 +1928,13 @@ document1.getElementById("driverAudit1").remove(); document1.getElementById("carAudit1").remove(); - document1.getElementsByTag("title").get(0).text("Today's activities"); + document1.getElementsByTag("title").get(0).text("Invite users and earn"); Element rewardToday1_user = document1.getElementById("rewardToday1_user"); rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ","); Element rewardToday1_award = document1.getElementById("rewardToday1_award"); rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS"); Element rewardToday1_content = document1.getElementById("rewardToday1_content"); - rewardToday1_content.text("Invite users to register and get event rewards. Note that this event is time-limited, please check the I-GO platform for details."); + rewardToday1_content.text("Get a bonus on I-GO today.\nInvite users to register to get the bonus.\nNote that this is a limited-time offer. Check your app for more details."); } if (3 == language) { document1.getElementById("chinese").remove(); @@ -1815,15 +1949,15 @@ document1.getElementById("driverAudit2").remove(); document1.getElementById("carAudit2").remove(); - document1.getElementsByTag("title").get(0).text("Activités du jour"); + document1.getElementsByTag("title").get(0).text("Invitez des utilisateurs et gagnez de l’argent"); Element rewardToday2_user = document1.getElementById("rewardToday2_user"); - rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); + rewardToday2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + ","); Element rewardToday2_award = document1.getElementById("rewardToday2_award"); rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney()); Element rewardToday2_content = document1.getElementById("rewardToday2_content"); - rewardToday2_content.text("Invitez les conducteurs à s’inscrire et à recevoir des récompenses. Notez que cet événement est limité dans le temps, veuillez consulter la plateforme I-GO pour plus de détails."); + rewardToday2_content.text("Obtenez un bonus sur I-GO dès aujourd’hui.\nInvitez les utilisateurs à s’inscrire pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails."); } - EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour", document1.html()); + EmailUtil.send(driver.getEmail(), language == 1 ? "邀请用户奖励(活动)" : language == 2 ? "Invite users and earn" : "Invitez des utilisateurs et gagnez de l’argent", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -1838,24 +1972,13 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); - FileInputStream fileInputStream = new FileInputStream(file); - File file1 = new File("/usr/local/nginx/html/files/pdf/"); - if(!file1.exists()){ - file1.mkdirs(); - } - file1 = new File("/usr/local/nginx/html/files/pdf/activity_" + randomString + ".pdf"); - if(!file1.exists()){ - file1.createNewFile(); - } - FileOutputStream fileOutputStream = new FileOutputStream(file1); - HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); tEmail.setType(2); - tEmail.setName(language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour"); + tEmail.setName(language == 1 ? "邀请用户奖励(活动)" : language == 2 ? "Invite users and earn" : "Invitez des utilisateurs et gagnez de l’argent"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; String week = EmailUtil.getWeek(language, i); @@ -1901,13 +2024,13 @@ document1.getElementById("driverAudit").remove(); document1.getElementById("carAudit").remove(); - document1.getElementsByTag("title").get(0).text("今日活动"); + document1.getElementsByTag("title").get(0).text("在线时长奖励(活动)"); Element rewardToday_user = document1.getElementById("rewardToday_user"); rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ","); Element rewardToday_award = document1.getElementById("rewardToday_award"); rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney()); Element rewardToday_content = document1.getElementById("rewardToday_content"); - rewardToday_content.text("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。 注意此活动是有时间限制的,详情请查看I-GO平台。"); + rewardToday_content.text("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。\n 注意此活动是有时间限制的,详情请查看I-GO平台。"); } if (2 == language) { document1.getElementById("chinese").remove(); @@ -1922,13 +2045,13 @@ document1.getElementById("driverAudit1").remove(); document1.getElementById("carAudit1").remove(); - document1.getElementsByTag("title").get(0).text("Today's activities"); + document1.getElementsByTag("title").get(0).text("Online-duration reward activity"); Element rewardToday1_user = document1.getElementById("rewardToday1_user"); rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ","); Element rewardToday1_award = document1.getElementById("rewardToday1_award"); rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS"); Element rewardToday1_content = document1.getElementById("rewardToday1_content"); - rewardToday1_content.text("Accumulated online " + driverActivityOnline.getOnline() + " hours today to get event rewards. Note that this event is time-limited, please check the I-GO platform for details."); + rewardToday1_content.text("Get a bonus for driving on I-GO today.\nStay online for " + driverActivityOnline.getOnline() + " hours to get the bonus.\nNote that this is a limited-time offer. Check your app for more details."); } if (3 == language) { document1.getElementById("chinese").remove(); @@ -1943,15 +2066,15 @@ document1.getElementById("driverAudit2").remove(); document1.getElementById("carAudit2").remove(); - document1.getElementsByTag("title").get(0).text("Activités du jour"); + document1.getElementsByTag("title").get(0).text("Activité de récompense en ligne"); Element rewardToday2_user = document1.getElementById("rewardToday2_user"); - rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); + rewardToday2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + ","); Element rewardToday2_award = document1.getElementById("rewardToday2_award"); rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney()); Element rewardToday2_content = document1.getElementById("rewardToday2_content"); - rewardToday2_content.text("Accumulé en ligne " + driverActivityOnline.getOnline() + " heures aujourd’hui pour obtenir des récompenses d’événement. Notez que cet événement est limité dans le temps, veuillez consulter la plateforme I-GO pour plus de détails."); + rewardToday2_content.text("Obtenez un bonus pour conduire sur I-GO dès aujourd’hui.\nRestez en ligne pendant " + driverActivityOnline.getOnline() + " heures pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails."); } - EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour", document1.html()); + EmailUtil.send(driver.getEmail(), language == 1 ? "在线时长奖励(活动)" : language == 2 ? "Online-duration reward activity" : "Activité de récompense en ligne", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -1966,24 +2089,13 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); - FileInputStream fileInputStream = new FileInputStream(file); - File file1 = new File("/usr/local/nginx/html/files/pdf/"); - if(!file1.exists()){ - file1.mkdirs(); - } - file1 = new File("/usr/local/nginx/html/files/pdf/activity_" + randomString + ".pdf"); - if(!file1.exists()){ - file1.createNewFile(); - } - FileOutputStream fileOutputStream = new FileOutputStream(file1); - HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); tEmail.setType(2); - tEmail.setName(language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour"); + tEmail.setName(language == 1 ? "在线时长奖励(活动)" : language == 2 ? "Online-duration reward activity" : "Activité de récompense en ligne"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; String week = EmailUtil.getWeek(language, i); @@ -2029,13 +2141,13 @@ document1.getElementById("driverAudit").remove(); document1.getElementById("carAudit").remove(); - document1.getElementsByTag("title").get(0).text("今日活动"); + document1.getElementsByTag("title").get(0).text("累计接单奖励(活动)"); Element rewardToday_user = document1.getElementById("rewardToday_user"); rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ","); Element rewardToday_award = document1.getElementById("rewardToday_award"); rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney()); Element rewardToday_content = document1.getElementById("rewardToday_content"); - rewardToday_content.text("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。 注意此活动是有时间限制的,详情请查看I-GO平台。"); + rewardToday_content.text("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。\n 注意此活动是有时间限制的,详情请查看I-GO平台。"); } if (2 == language) { document1.getElementById("chinese").remove(); @@ -2050,13 +2162,13 @@ document1.getElementById("driverAudit1").remove(); document1.getElementById("carAudit1").remove(); - document1.getElementsByTag("title").get(0).text("Today's activities"); + document1.getElementsByTag("title").get(0).text("Cumulative order activity"); Element rewardToday1_user = document1.getElementById("rewardToday1_user"); rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ","); Element rewardToday1_award = document1.getElementById("rewardToday1_award"); rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS"); Element rewardToday1_content = document1.getElementById("rewardToday1_content"); - rewardToday1_content.text("Complete " + driverActivityOrder.getOrderNum() + " orders in total today to get event rewards. Note that this event is time-limited, please check the I-GO platform for details."); + rewardToday1_content.text("Get a bonus for driving on I-GO today.\nStay online and complete " + driverActivityOrder.getOrderNum() + " trips to get the bonus.\nNote that this is a limited-time offer. Check your app for more details."); } if (3 == language) { document1.getElementById("chinese").remove(); @@ -2071,15 +2183,15 @@ document1.getElementById("driverAudit2").remove(); document1.getElementById("carAudit2").remove(); - document1.getElementsByTag("title").get(0).text("Activités du jour"); + document1.getElementsByTag("title").get(0).text("Activité cumulée des commandes"); Element rewardToday2_user = document1.getElementById("rewardToday2_user"); - rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); + rewardToday2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + ","); Element rewardToday2_award = document1.getElementById("rewardToday2_award"); rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney()); Element rewardToday2_content = document1.getElementById("rewardToday2_content"); - rewardToday2_content.text("Effectuez " + driverActivityOrder.getOrderNum() + " commandes au total aujourd’hui pour obtenir des récompenses d’événement. Notez que cet événement est limité dans le temps, veuillez consulter la plateforme I-GO pour plus de détails."); + rewardToday2_content.text("Obtenez un bonus pour conduire sur I-GO dès aujourd’hui.\nRestez en ligne et effectuez " + driverActivityOrder.getOrderNum() + " trajets pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails."); } - EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour", document1.html()); + EmailUtil.send(driver.getEmail(), language == 1 ? "累计接单奖励(活动)" : language == 2 ? "Cumulative order activity" : "Activité cumulée des commandes", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -2094,24 +2206,13 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); - FileInputStream fileInputStream = new FileInputStream(file); - File file1 = new File("/usr/local/nginx/html/files/pdf/"); - if(!file1.exists()){ - file1.mkdirs(); - } - file1 = new File("/usr/local/nginx/html/files/pdf/activity_" + randomString + ".pdf"); - if(!file1.exists()){ - file1.createNewFile(); - } - FileOutputStream fileOutputStream = new FileOutputStream(file1); - HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); tEmail.setType(2); - tEmail.setName(language == 1 ? "今日活动" : language == 2 ? "Today's activities" : "Activités du jour"); + tEmail.setName(language == 1 ? "累计接单奖励(活动)" : language == 2 ? "Cumulative order activity" : "Activité cumulée des commandes"); tEmail.setCreateTime(new Date()); int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; String week = EmailUtil.getWeek(language, i); @@ -2182,11 +2283,11 @@ document1.getElementById("driverAudit").remove(); document1.getElementById("carAudit").remove(); - document1.getElementsByTag("title").get(0).text("在线时长奖励"); + document1.getElementsByTag("title").get(0).text("司机奖励通知"); Element reward_user = document1.getElementById("reward_user"); reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ","); Element reward_content = document1.getElementById("reward_content"); - reward_content.text("今日累计在线 " + dao.getOnline() + "小时,获得奖励GHS" + dah.getMoney() + ",请查收"); + reward_content.text("今日累计在线" + dao.getOnline() + "小时,获得奖励GHS" + dah.getMoney() + ",请查收。\n详情请查看I-GO平台。"); } if (2 == language) { document1.getElementById("chinese").remove(); @@ -2201,11 +2302,11 @@ document1.getElementById("driverAudit1").remove(); document1.getElementById("carAudit1").remove(); - document1.getElementsByTag("title").get(0).text("Online-duration reward"); + document1.getElementsByTag("title").get(0).text("Reward-driver notice"); Element reward1_user = document1.getElementById("reward1_user"); reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ","); Element reward1_content = document1.getElementById("reward1_content"); - reward1_content.text("accumulated online for " + dao.getOnline() + " hour today, get reward GHS" + dah.getMoney() + ", please check"); + reward1_content.text("You stayed online for " + dao.getOnline() + " hours today, and got a bonus of GHS" + dah.getMoney() + ", please check.\nCheck your app for more details."); } if (3 == language) { document1.getElementById("chinese").remove(); @@ -2220,13 +2321,13 @@ document1.getElementById("driverAudit2").remove(); document1.getElementById("carAudit2").remove(); - document1.getElementsByTag("title").get(0).text("Récompenses de temps en ligne"); + document1.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense"); Element reward2_user = document1.getElementById("reward2_user"); - reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); + reward2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + ","); Element reward2_content = document1.getElementById("reward2_content"); - reward2_content.text("Accumulé en ligne pendant " + dao.getOnline() + " heure aujourd’hui, obtenez la récompense GHS " + dah.getMoney() + ", s’il vous plaît vérifier"); + reward2_content.text("Vous êtes resté en ligne pendant " + dao.getOnline() + " heures aujourd’hui et avez obtenu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.\nConsultez votre application pour plus de détails."); } - EmailUtil.send(driver.getEmail(), language == 1 ? "在线时长奖励" : language == 2 ? "Online-duration reward" : "Récompenses de temps en ligne", document1.html()); + EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -2241,24 +2342,13 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); - FileInputStream fileInputStream = new FileInputStream(file); - File file1 = new File("/usr/local/nginx/html/files/pdf/"); - if(!file1.exists()){ - file1.mkdirs(); - } - file1 = new File("/usr/local/nginx/html/files/pdf/rewards_" + randomString + ".pdf"); - if(!file1.exists()){ - file1.createNewFile(); - } - FileOutputStream fileOutputStream = new FileOutputStream(file1); - HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/rewards_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); tEmail.setType(2); - tEmail.setName(language == 1 ? "在线时长奖励" : language == 2 ? "Online-duration reward" : "Récompenses de temps en ligne"); + 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); @@ -2312,11 +2402,11 @@ document1.getElementById("driverAudit").remove(); document1.getElementById("carAudit").remove(); - document1.getElementsByTag("title").get(0).text("累计接单奖励"); + document1.getElementsByTag("title").get(0).text("司机奖励通知"); Element reward_user = document1.getElementById("reward_user"); reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ","); Element reward_content = document1.getElementById("reward_content"); - reward_content.text("今日累计接单 " + dao.getOrderNum() + "单,获得奖励GHS" + dah.getMoney() + ",请查收"); + reward_content.text("今日累计接单" + dao.getOrderNum() + "单,获得奖励GHS" + dah.getMoney() + ",请查收。\n详情请查看I-GO平台。"); } if (2 == language) { document1.getElementById("chinese").remove(); @@ -2331,11 +2421,11 @@ document1.getElementById("driverAudit1").remove(); document1.getElementById("carAudit1").remove(); - document1.getElementsByTag("title").get(0).text("Cumulative orders reward"); + document1.getElementsByTag("title").get(0).text("Reward-driver notice"); Element reward1_user = document1.getElementById("reward1_user"); reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ","); Element reward1_content = document1.getElementById("reward1_content"); - reward1_content.text("A total of " + dao.getOrderNum() + " orders have been received today, and the reward GHS" + dah.getMoney() + " will be awarded, please check"); + reward1_content.text("You completed " + dao.getOrderNum() + " trips today, and got a bonus of GHS" + dah.getMoney() + ", please check.\nCheck your app for more details."); } if (3 == language) { document1.getElementById("chinese").remove(); @@ -2350,14 +2440,14 @@ document1.getElementById("driverAudit2").remove(); document1.getElementById("carAudit2").remove(); - document1.getElementsByTag("title").get(0).text("Récompense cumulée des commandes"); + document1.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense"); Element reward2_user = document1.getElementById("reward2_user"); - reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); + reward2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + ","); Element reward2_content = document1.getElementById("reward2_content"); - reward2_content.text("Un total de " + dao.getOrderNum() + " commandes ont été reçues aujourd’hui, et la récompense GHS " + dah.getMoney() + " sera décernée, s’il vous plaît vérifier"); + reward2_content.text("Vous avez effectué " + dao.getOrderNum() + " trajets aujourd’hui et avez reçu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.\nConsultez votre application pour plus de détails."); } - EmailUtil.send(driver.getEmail(), language == 1 ? "累计接单奖励" : language == 2 ? "Cumulative orders reward" : "Récompense cumulée des commandes", document1.html()); + EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html()); String randomString = ToolUtil.getRandomString(10); //开始生成pdf收据和html收据 File file = new File("/usr/local/nginx/html/files/html/"); @@ -2372,24 +2462,13 @@ fileWriter.write(document1.html()); fileWriter.flush(); fileWriter.close(); - FileInputStream fileInputStream = new FileInputStream(file); - File file1 = new File("/usr/local/nginx/html/files/pdf/"); - if(!file1.exists()){ - file1.mkdirs(); - } - file1 = new File("/usr/local/nginx/html/files/pdf/rewards_" + randomString + ".pdf"); - if(!file1.exists()){ - file1.createNewFile(); - } - FileOutputStream fileOutputStream = new FileOutputStream(file1); - HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream); String link ="http://182.160.16.251:81/files/html/rewards_" + randomString + ".html"; TEmail tEmail = new TEmail(); tEmail.setLink(link); tEmail.setUserId(driver.getId()); tEmail.setType(2); - tEmail.setName(language == 1 ? "累计接单奖励" : language == 2 ? "Cumulative orders reward" : "Récompense cumulée des commandes"); + 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); -- Gitblit v1.7.1