From ddcef762ff4a159e132c68dfec512c60a68a53e6 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 01 十二月 2023 18:21:24 +0800 Subject: [PATCH] 更新接口 --- DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 1520 +++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 1,336 insertions(+), 184 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 696c812..f677fb2 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 @@ -9,7 +9,10 @@ import com.stylefeng.guns.core.shiro.ShiroUser; import com.stylefeng.guns.core.util.JwtTokenUtil; import com.stylefeng.guns.core.util.ToolUtil; +import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics; import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService; +import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar; +import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService; import com.stylefeng.guns.modular.system.dao.*; import com.stylefeng.guns.modular.system.model.*; import com.stylefeng.guns.modular.system.service.*; @@ -17,6 +20,7 @@ import com.stylefeng.guns.modular.system.util.GoogleMap.AddressComponentsVo; import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil; import com.stylefeng.guns.modular.system.util.GoogleMap.ReverseGeocodeVo; +import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils; import com.stylefeng.guns.modular.system.warpper.*; import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService; import org.apache.shiro.authc.SimpleAuthenticationInfo; @@ -24,12 +28,19 @@ import org.apache.shiro.authc.credential.HashedCredentialsMatcher; import org.apache.shiro.crypto.hash.Md5Hash; import org.apache.shiro.util.ByteSource; +import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; +import org.jsoup.nodes.Element; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; 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.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; @@ -113,9 +124,6 @@ @Autowired private IOrderTaxiService orderTaxiService; - @Autowired - private PushMinistryOfTransportUtil pushMinistryOfTransportUtil; - @Resource private CarServiceMapper carServiceMapper; @@ -126,12 +134,25 @@ private ICityService cityService; @Autowired + private IOrderPrivateCarService orderPrivateCarService; + + @Autowired private IOrderLogisticsService orderLogisticsService; - @Value("${pushMinistryOfTransport}") - private boolean pushMinistryOfTransport; + @Resource + private DriverOnlineMapper driverOnlineMapper; + + @Value("${spring.mail.template-path}") + private String templatePath; private String salt = "SA;d5#"; + + @Autowired + private SMSUtil smsUtil; + + + @Autowired + private TEmailService emailService; @Override @@ -151,56 +172,118 @@ * @throws Exception */ @Override - public ResultUtil queryCaptcha(String phone, Integer type) throws Exception { + public ResultUtil queryCaptcha(String phone, Integer type, Integer language) throws Exception { + if(type == 3){ + Driver driver1 = driverMapper.queryByPhone(phone); + if(null != driver1){ + if(driver1.getAuthState() == 1){ + return ResultUtil.error(language == 1 ? "该司机正在审核中" : language == 2 ? "The driver is being reviewed." : "Le chauffeur est en cours d’examen."); + } + if(driver1.getAuthState() == 2){ + return ResultUtil.error(language == 1 ? "该司机已存在" : language == 2 ? "The driver is already existent." : "Le chauffeur existe déjà."); + } + if(driver1.getAuthState() == 3){ + return ResultUtil.error(language == 1 ? "该司机账号已被冻结" : language == 2 ? "Driver account is frozen." : "Le compte du chauffeur est gelé."); + } + } + } + Random random = new Random(); StringBuffer sb = new StringBuffer(); for(int i = 0; i < 4; i++){ sb.append((int) (random.nextDouble() * 10)); } String authCode = sb.toString(); - String sms = "短信验证码【" + authCode + "】已发到您的手机,验证码将在5分钟后失效,请及时登录!"; + String sms = ""; //发送验证码短信 redisUtil.setStrValue(phone, authCode, 5 * 60);//设置五分钟过期 - String templateCode = ""; - switch (type){ + switch (language){ case 1: - templateCode = "SMS_207770039";//身份验证 + sms = "您的验证码为:" + authCode + ",该验证码5分钟内有效,请勿泄漏于他人!"; break; case 2: - templateCode = "SMS_207770039";//登录确认 + sms = "Your verification code is: " + authCode + ", the verification code is valid within 5 minutes, do not leak to others!"; break; case 3: - templateCode = "SMS_207770039";//用户注册 - break; - case 4: - templateCode = "SMS_207770039";//修改密码 + sms = "Votre code de vérification est: " + authCode + ". Ce code est valide pendant 5 minutes. Ne le divulguez pas aux autres!"; break; } - String sData = aLiSendSms.sendSms(phone, templateCode, "{\"code\":\"" + authCode + "\"}"); - JSONObject jsonObject = JSON.parseObject(sData); - String message = jsonObject.getString("Message"); - if(!"OK".equals(message)){ - return ResultUtil.error(""); - } + smsUtil.sendCellulantMessage(phone, sms); System.out.println(sms); return ResultUtil.success(); } @Override - public ResultUtil queryEmailCaptcha(String email) throws Exception { + public ResultUtil queryEmailCaptcha(String email, Integer language) throws Exception { Random random = new Random(); StringBuffer sb = new StringBuffer(); for(int i = 0; i < 4; i++){ sb.append((int) (random.nextDouble() * 10)); } String authCode = sb.toString(); - String sms = "您发送的验证码为【" + authCode + "】,验证码将在5分钟后失效!"; //发送验证码短信 redisUtil.setStrValue(email, authCode, 5 * 60);//设置五分钟过期 - EmailUtil.getMimeMessage(email, "验证码", sms); + + 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("invite").remove(); + document.getElementById("user").remove(); + document.getElementById("settle").remove(); + document.getElementById("pass").remove(); + document.getElementById("bill").remove(); + document.getElementById("reward").remove(); + document.getElementById("rewardToday").remove(); + document.getElementById("driverAudit").remove(); + document.getElementById("carAudit").remove(); + + Element email_user = document.getElementById("email_user"); + email_user.text("您好 ,"); + Element email_content = document.getElementById("email_content"); + email_content.text("邮件验证码是:" + authCode + ",请在5分钟内完成验证"); + } + if(2 == language){ + document.getElementById("chinese").remove(); + document.getElementById("french").remove(); + document.getElementById("invite1").remove(); + document.getElementById("user1").remove(); + document.getElementById("settle1").remove(); + document.getElementById("pass1").remove(); + document.getElementById("bill1").remove(); + document.getElementById("reward1").remove(); + document.getElementById("rewardToday1").remove(); + document.getElementById("driverAudit1").remove(); + document.getElementById("carAudit1").remove(); + + Element email1_user = document.getElementById("email1_user"); + email1_user.text("Hello ,"); + Element email1_content = document.getElementById("email1_content"); + email1_content.text("verification code is " + authCode + ", please complete the verification within 5 minutes. If the request wasn't made by you, please ignore this email."); + } + if(3 == language){ + document.getElementById("chinese").remove(); + document.getElementById("english").remove(); + document.getElementById("invite2").remove(); + document.getElementById("user2").remove(); + document.getElementById("settle2").remove(); + document.getElementById("pass2").remove(); + document.getElementById("bill2").remove(); + document.getElementById("reward2").remove(); + document.getElementById("rewardToday2").remove(); + document.getElementById("driverAudit2").remove(); + document.getElementById("carAudit2").remove(); + + Element email2_user = document.getElementById("email2_user"); + email2_user.text("Hello ,"); + Element email2_content = document.getElementById("email2_content"); + email2_content.text("Vous êtes lié à une adresse e-mail. Le code de vérification e-mail pour cette demande est: " + authCode + ". Veuillez compléter la vérification dans les 5 minutes"); + } + EmailUtil.send(email, language == 1 ? "验证码" : language == 2 ? "Verification code" : "Code de vérification", document.html()); return ResultUtil.success(); } @@ -212,12 +295,12 @@ * @throws Exception */ @Override - public boolean checkCaptcha(String phone, String code) throws Exception { - Object value = redisUtil.getValue(phone); + public boolean checkCaptcha(String email, String phone, String code) throws Exception { + Object value = redisUtil.getValue(ToolUtil.isNotEmpty(email) ? email : phone); + redisUtil.remove(ToolUtil.isNotEmpty(email) ? email : phone); if("1246".equals(code)){ return true; } - if(null != value && code.equals(String.valueOf(value))){ return true; }else{ @@ -231,10 +314,10 @@ * @throws Exception */ @Override - public ResultUtil registeredDriver(String phone, String code, String password, Integer uid, Integer type, Integer userType) throws Exception { - ResultUtil<LoginWarpper> result = this.registeredDriver(phone, code, password,uid,type); + public ResultUtil registeredDriver(String phoneOperator, String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language) throws Exception { + ResultUtil<LoginWarpper> result = this.registeredDriver(phoneOperator, phone, code, password,uid,type, language); if(result.getCode() == 200 && null != uid){ - /*if(type == 2){ + if(type == 2){ Driver driver = driverMapper.selectById(uid); List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId()); BigDecimal bigDecimal = new BigDecimal("0"); @@ -248,6 +331,110 @@ 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(); + + 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(); + + 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(); + + 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 ? "invitation bonus" : "prime d'invitation", 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(); + 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 ? "invitation bonus" : "prime d'invitation"); + 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); @@ -274,7 +461,7 @@ userCouponRecordMapper.insert(userCouponRecord); } } - }*/ + } } return result; } @@ -291,10 +478,10 @@ * @throws Exception */ @Override - public ResultUtil<LoginWarpper> registeredDriver(String phone, String code, String password,Integer uid,Integer uType) throws Exception { - boolean b = this.checkCaptcha(phone, code); + public ResultUtil<LoginWarpper> registeredDriver(String phoneOperator, String phone, String code, String password,Integer uid,Integer uType, Integer language) throws Exception { + boolean b = this.checkCaptcha("", phone, code); if(!b){ - return ResultUtil.error("验证码无效"); + return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide"); } Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据 @@ -303,19 +490,19 @@ driverMapper.updateById(driver1); LoginWarpper loginWarpper = new LoginWarpper(); loginWarpper.setId(driver1.getId()); - return ResultUtil.error("电话号码已使用", loginWarpper); + return ResultUtil.success(loginWarpper); } - driver1 = driverMapper.queryByPhone(phone); if(null != driver1){ LoginWarpper loginWarpper = new LoginWarpper(); loginWarpper.setId(driver1.getId()); - return ResultUtil.error("电话号码已使用", loginWarpper); + return ResultUtil.success(loginWarpper); } 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); @@ -356,17 +543,19 @@ * @throws Exception */ @Override - public ResultUtil updateDriver(RegisteredWarpper registeredWarpper, Integer uid) throws Exception { + public ResultUtil updateDriver(RegisteredWarpper registeredWarpper, Integer uid, Integer language) throws Exception { Driver driver = this.selectById(uid); - driver.setName(registeredWarpper.getName()); + driver.setLastName(registeredWarpper.getLastName()); + driver.setFirstName(registeredWarpper.getFirstName()); driver.setSex(registeredWarpper.getSex()); driver.setIdCard(registeredWarpper.getIdCard()); + driver.setBirthday(registeredWarpper.getBirthday()); City city1 = cityService.selectById(registeredWarpper.getPlaceOfPracticeId()); String[] city = new String[]{city1.getEnglishName()}; Company query = companyCityService.query(city); if(null == query){ - return ResultUtil.error("选择从业地暂未开通业务"); + return ResultUtil.error(language == 1 ? "选择从业地暂未开通业务" : language == 2 ? "Not yet to commence business at the workplace selected." : "N’a pas encore commencé ses activités sur le lieu de travail sélectionné."); } if(null != query){ switch (query.getType()){ @@ -385,20 +574,21 @@ driver.setHeadImgUrl(registeredWarpper.getHeadImgUrl()); driver.setIdCardImgUrl1(registeredWarpper.getIdCardImgUrl1()); driver.setIdCardImgUrl2(registeredWarpper.getIdCardImgUrl2()); - driver.setPlaceOfEmployment(city1.getEnglishName()); + driver.setPlaceOfEmployment(language == 1 ? city1.getChineseName() : language == 2 ? city1.getEnglishName() : city1.getFrenchName()); driver.setDriverAddress(registeredWarpper.getDriverContactAddress()); driver.setDriverContactAddress(registeredWarpper.getDriverContactAddress()); driver.setDriverContactAddress_(registeredWarpper.getDriverContactAddress_()); - driver.setPlaceOfPractice(city1.getEnglishName()); + driver.setPlaceOfPractice(language == 1 ? city1.getChineseName() : language == 2 ? city1.getEnglishName() : city1.getFrenchName()); Calendar calendar = Calendar.getInstance(); - calendar.setTime(registeredWarpper.getGetDriverLicenseDate()); +// calendar.setTime(registeredWarpper.getGetDriverLicenseDate()); Calendar now = Calendar.getInstance(); now.setTime(new Date()); driver.setDriverAge(now.get(Calendar.YEAR) - calendar.get(Calendar.YEAR)); - driver.setGetDriverLicenseDate(registeredWarpper.getGetDriverLicenseDate()); - driver.setDriveCardImgUrl1(registeredWarpper.getDriveCardImgUrl1()); +// driver.setGetDriverLicenseDate(registeredWarpper.getGetDriverLicenseDate()); + driver.setDriveCardImgUrl1(registeredWarpper.getDriveCardImgUrl()); driver.setDriveCardImgUrl2(registeredWarpper.getDriveCardImgUrl2()); + driver.setDriveCard(registeredWarpper.getDriveCard()); driver.setEmail(registeredWarpper.getEmail()); this.updateById(driver); @@ -423,6 +613,103 @@ } } + if(ToolUtil.isNotEmpty(driver.getEmail())){ + String path1 = templatePath + "driver/index.html"; + Document document1 = Jsoup.parse(new File(path1), "UTF-8"); + if(1 == language){ + document1.getElementById("english").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite").remove(); + document1.getElementById("user").remove(); + document1.getElementById("pass").remove(); + document1.getElementById("email").remove(); + document1.getElementById("bill").remove(); + document1.getElementById("reward").remove(); + document1.getElementById("rewardToday").remove(); + document1.getElementById("driverAudit").remove(); + document1.getElementById("carAudit").remove(); + + Element settle_user = document1.getElementById("settle_user"); + settle_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ","); + } + if(2 == language){ + document1.getElementById("chinese").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite1").remove(); + document1.getElementById("user1").remove(); + document1.getElementById("pass1").remove(); + document1.getElementById("email1").remove(); + document1.getElementById("bill1").remove(); + document1.getElementById("reward1").remove(); + document1.getElementById("rewardToday1").remove(); + document1.getElementById("driverAudit1").remove(); + document1.getElementById("carAudit1").remove(); + + Element settle1_user = document1.getElementById("settle1_user"); + settle1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ","); + } + if(3 == language){ + document1.getElementById("chinese").remove(); + document1.getElementById("english").remove(); + document1.getElementById("invite2").remove(); + document1.getElementById("user2").remove(); + document1.getElementById("pass2").remove(); + document1.getElementById("email2").remove(); + document1.getElementById("bill2").remove(); + document1.getElementById("reward2").remove(); + document1.getElementById("rewardToday2").remove(); + document1.getElementById("driverAudit2").remove(); + document1.getElementById("carAudit2").remove(); + + Element settle2_user = document1.getElementById("settle2_user"); + settle2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); + } + EmailUtil.send(driver.getEmail(), language == 1 ? "注册成功" : language == 2 ? "registration success" : "succès de l'inscription", document1.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/registration_" + randomString + ".html"); + if(!file.exists()){ + file.createNewFile(); + } + FileWriter fileWriter = new FileWriter(file); + 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 ? "registration success" : "succès de l'inscription"); + 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); + } + return ResultUtil.success(); } @@ -436,17 +723,114 @@ * @throws Exception */ @Override - public ResultUtil resetPassword(String phone, String code, String password) throws Exception { - boolean b = this.checkCaptcha(phone, code); + public ResultUtil resetPassword(String phone, String code, String password, Integer language) throws Exception { + boolean b = this.checkCaptcha("", phone, code); if(!b){ - return ResultUtil.error("验证码无效"); + return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide"); } Driver driver = driverMapper.queryByPhone(phone); if(null == driver){ - return ResultUtil.error("电话号码未注册"); + return ResultUtil.error(language == 1 ? "电话号码未注册" : language == 2 ? "Mobile phone number was not registered." : "Le numéro de téléphone portable n’a pas été enregistré."); } driver.setPassword(ShiroKit.md5(password, salt)); 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("user").remove(); + document1.getElementById("settle").remove(); + document1.getElementById("email").remove(); + document1.getElementById("bill").remove(); + document1.getElementById("reward").remove(); + document1.getElementById("rewardToday").remove(); + document1.getElementById("driverAudit").remove(); + document1.getElementById("carAudit").remove(); + + Element pass_user = document1.getElementById("pass_user"); + pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ","); + } + if(2 == language){ + document1.getElementById("chinese").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite1").remove(); + document1.getElementById("user1").remove(); + document1.getElementById("settle1").remove(); + document1.getElementById("email1").remove(); + document1.getElementById("bill1").remove(); + document1.getElementById("reward1").remove(); + document1.getElementById("rewardToday1").remove(); + document1.getElementById("driverAudit1").remove(); + document1.getElementById("carAudit1").remove(); + + Element pass1_user = document1.getElementById("pass1_user"); + pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ","); + } + if(3 == language){ + document1.getElementById("chinese").remove(); + document1.getElementById("english").remove(); + document1.getElementById("invite2").remove(); + document1.getElementById("user2").remove(); + document1.getElementById("settle2").remove(); + document1.getElementById("email2").remove(); + document1.getElementById("bill2").remove(); + document1.getElementById("reward2").remove(); + document1.getElementById("rewardToday2").remove(); + document1.getElementById("driverAudit2").remove(); + document1.getElementById("carAudit2").remove(); + + Element pass2_user = document1.getElementById("pass2_user"); + pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); + } + 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/"); + if(!file.exists()){ + file.mkdirs(); + } + file = new File("/usr/local/nginx/html/files/html/reset_" + randomString + ".html"); + if(!file.exists()){ + file.createNewFile(); + } + FileWriter fileWriter = new FileWriter(file); + 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.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); + } smsrecordService.saveData(6, phone, code, "短信验证码【" + code + "】已发到您的手机,验证码将在5分钟后失效,请及时登录!"); return ResultUtil.success(); @@ -490,24 +874,24 @@ * @throws Exception */ @Override - public ResultUtil<LoginWarpper> driverLogin(String phone, String password) throws Exception { + public ResultUtil<LoginWarpper> driverLogin(String phone, String password, Integer language) throws Exception { Driver driver = driverMapper.queryByPhone(phone); if(null == driver){ - return ResultUtil.error("账号未注册"); + return ResultUtil.error(language == 1 ? "账号未注册" : language == 2 ? "Account unregistered" : "Compte non enregistré"); } - /*if(driver.getAuthState() == 1){ - return ResultUtil.error("账号正在审核中,请耐心等待"); - }*/ + if(driver.getAuthState() == 1){ + return ResultUtil.error(language == 1 ? "账号正在审核中,请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter."); + } if(driver.getAuthState() == 3){ - return ResultUtil.error("账号已被冻结,请联系管理员"); + return ResultUtil.error(language == 1 ? "账号已被冻结,请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur."); } if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){ - return ResultUtil.error("密码错误"); + return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné"); } String value = redisUtil.getValue("DEVICE_" + driver.getId()); if(ToolUtil.isNotEmpty(value)){ - return ResultUtil.error("当前账户正在车载端登录"); + return ResultUtil.error(language == 1 ? "当前账户正在车载端登录" : language == 2 ? "The current account is logging in to the vehicle terminal" : "Le compte actuel est connecté côté voiture"); } //调用单点登录逻辑 @@ -518,11 +902,6 @@ loginWarpper.setId(driver.getId()); loginWarpper.setToken(token); loginWarpper.setAppid(UUIDUtil.getRandomCode()); - - //创建高德猎鹰的终端数据 - String tid = gdFalconUtil.createTerminal(phone); - loginWarpper.setServerId(gdFalconUtil.getServerId()); - loginWarpper.setTerminalId(tid); if(driver.getCompanyId()==null){ loginWarpper.setJumpCode("100000"); }else{ @@ -541,10 +920,29 @@ * @throws Exception */ @Override - public Map<String, Object> queryHomeData(Integer uid) throws Exception { + public Map<String, Object> queryHomeData(Integer uid, Integer language) throws Exception { Map<String, Object> map = driverMapper.queryHomeData(uid); - int size = this.queryMyActivity(uid, new Date()).size(); + int size = this.queryMyActivity(uid, new Date(), language).size(); map.put("activity", size); + //获取司机待支付的现金支付订单推送司机支付 +// new Thread(new Runnable() { +// @Override +// public void run() { +// List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("driverId", uid).eq("payType", 4) +// .eq("driverPay", 1).eq("isDelete", 1)); +// if(orderPrivateCars.size() > 0){ +// OrderPrivateCar orderPrivateCar = orderPrivateCars.get(0); +// pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1); +// return; +// } +// List<OrderLogistics> orderLogistics = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().eq("driverId", uid).eq("payType", 4) +// .eq("isDelete", 1).eq("driverPay", 1)); +// if(orderLogistics.size() > 0){ +// OrderLogistics orderLogistics1 = orderLogistics.get(0); +// pushUtil.pushOfflinePayment(2, orderLogistics1.getDriverId(), orderLogistics1.getId(), orderLogistics1.getType()); +// } +// } +// }).start(); return map; } @@ -581,28 +979,19 @@ * @throws Exception */ @Override - public ResultUtil work(Integer uid, String type) throws Exception { + public ResultUtil work(Integer uid, String type, Integer language) throws Exception { DriverWork driverWork = driverWorkMapper.queryNewWork(uid, null, 1); Driver driver = this.selectById(uid); if(null != driverWork){//作下班操作 //检测是否有未完成的订单 - List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid); + List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid, language); if(list.size() > 0){ - return ResultUtil.error("还有未完成的订单,不能进行下班操作"); + return ResultUtil.error(language == 1 ? "还有未完成的订单,不能进行下班操作" : language == 2 ? "There are still outstanding orders, can not be off-duty operation" : "Il y a encore des commandes en suspens qui ne peuvent pas être exécutées"); } driverWork.setEndTime(new Date()); driverWork.setState(2); driverWorkMapper.updateById(driverWork); driver.setState(1); - - new Thread(new Runnable() { - @Override - public void run() { - if(pushMinistryOfTransport){//上传数据 - pushMinistryOfTransportUtil.operateLogout(uid); - } - } - }).start(); }else{ LoginWarpper loginWarpper = new LoginWarpper(); if(driver.getCompanyId()==null){ @@ -616,20 +1005,20 @@ } //判断是否存在审核中的资料 if(driver.getAuthState()==1){ - return ResultUtil.error("资料审核中,不能出车"); + return ResultUtil.error(language == 1 ? "资料审核中,不能出车" : language == 2 ? "Data is being reviewed, unable to drive." : "Les données sont en cours d’examen, il est impossible de conduire."); } if(driver.getAuthState()==4){ - return ResultUtil.error("请完善资料后再出车"); + return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire."); } Car car = carService.selectById(driver.getCarId()); if(car==null){ - return ResultUtil.error("请完善资料后再出车"); + return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire."); } if(car.getAuthState()==1){ - return ResultUtil.error("资料审核中,不能出车"); + return ResultUtil.error(language == 1 ? "资料审核中,不能出车" : language == 2 ? "Data is being reviewed, unable to drive." : "Les données sont en cours d’examen, il est impossible de conduire."); } if(car.getAuthState()==4){ - return ResultUtil.error("请完善资料后再出车"); + return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire."); } driverWork = new DriverWork(); driverWork.setState(1); @@ -638,15 +1027,6 @@ driverWork.setType(type); driverWorkMapper.insert(driverWork); driver.setState(2); - - new Thread(new Runnable() { - @Override - public void run() { - if(pushMinistryOfTransport){ //上传数据 - pushMinistryOfTransportUtil.operateLogin(uid); - } - } - }).start(); } this.updateById(driver); return ResultUtil.success(); @@ -656,12 +1036,12 @@ @Override - public ResultUtil work2(Integer uid, String type) throws Exception { + public ResultUtil work2(Integer uid, String type, Integer language) throws Exception { //判断是否已经上班,如果已经上班则先下班操作 DriverWork driverWork1 = driverWorkMapper.queryNewWork(uid, null, 1); if(null != driverWork1){ if(!driverWork1.getType().equals("2")){ - return ResultUtil.error("请先将其他业务下班后再进行上班操作"); + return ResultUtil.error(language == 1 ? "请先将其他业务下班后再进行上班操作" : language == 2 ? "Please do other business after work first" : "S’il vous plaît faire d’autres affaires après les heures de travail avant de travailler"); } } @@ -669,23 +1049,14 @@ Driver driver = this.selectById(uid); if(null != driverWork){//作下班操作 //检测是否有未完成的订单 - List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid); + List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid, language); if(list.size() > 0){ - return ResultUtil.error("还有未完成的订单,不能进行下班操作"); + return ResultUtil.error(language == 1 ? "还有未完成的订单,不能进行下班操作" : language == 2 ? "There are still outstanding orders, can not be off-duty operation" : "Il y a encore des commandes en suspens qui ne peuvent pas être exécutées"); } driverWork.setEndTime(new Date()); driverWork.setState(2); driverWorkMapper.updateById(driverWork); driver.setState(1); - - new Thread(new Runnable() { - @Override - public void run() { - if(pushMinistryOfTransport){//上传数据 - pushMinistryOfTransportUtil.operateLogout(uid); - } - } - }).start(); }else{ LoginWarpper loginWarpper = new LoginWarpper(); if(driver.getCompanyId()==null){ @@ -712,7 +1083,7 @@ if(Integer.valueOf(t) == 3){ CarService query1 = carServiceMapper.query(3, driver.getCarId()); if(query1 == null){ - return ResultUtil.error("车辆未添加跨城服务"); + return ResultUtil.error(language == 1 ? "车辆未添加跨城服务" : language == 2 ? "No cross-city service is added to the vehicle" : "Véhicule non ajouté pour le service cross city"); } } DriverOrders query = driverOrdersMapper.query(uid, Integer.valueOf(t)); @@ -723,16 +1094,6 @@ driverOrdersMapper.insert(driverOrders); } } - - new Thread(new Runnable() { - @Override - public void run() { - if(pushMinistryOfTransport){ - //上传数据 - pushMinistryOfTransportUtil.operateLogin(uid); - } - } - }).start(); } this.updateById(driver); return ResultUtil.success(); @@ -746,16 +1107,16 @@ * @throws Exception */ @Override - public Map<String, Object> queryHomeNum(Integer uid) throws Exception { + public Map<String, Object> queryHomeNum(Integer uid, Integer language) throws Exception { Map<String, Object> map = new HashMap<>(); //出租车 - List<Map<String, Object>> list = orderTaxiService.queryOrderList(1, uid); + List<Map<String, Object>> list = orderTaxiService.queryOrderList(language, 1, uid); map.put("service", list.size());//服务中 - list = orderTaxiService.queryOrderList(2, uid); + list = orderTaxiService.queryOrderList(language, 2, uid); map.put("reservation", list.size());//预约 - List<Map<String, Object>> list1 = orderLogisticsService.queryOrderList(uid); + List<Map<String, Object>> list1 = orderLogisticsService.queryOrderList(uid, language); map.put("small", list1.size());//小件 - int size = this.queryMyActivity(uid, new Date()).size(); + int size = this.queryMyActivity(uid, new Date(), language).size(); map.put("activity", size);//活动 return map; } @@ -768,7 +1129,7 @@ * @throws Exception */ @Override - public List<BaseWarpper> queryMyBusiness(Integer uid) throws Exception { + public List<BaseWarpper> queryMyBusiness(Integer uid, Integer language) throws Exception { List<DriverService> list = driverServiceMapper.queryMyBusiness(uid); List<BaseWarpper> maps = new ArrayList<>(); for (DriverService d : list){ @@ -776,19 +1137,19 @@ baseWarpper.setId(d.getType()); switch (d.getType()){ case 1: - baseWarpper.setName("专车"); + baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course"); break; case 2: - baseWarpper.setName("出租车"); + baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi"); break; case 3: - baseWarpper.setName("跨城出行"); + baseWarpper.setName(language == 1 ? "跨城出行" : language == 2 ? "Cross-town travel" : "Se déplacer à travers la ville"); break; case 4: - baseWarpper.setName("同城小件物流"); + baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison"); break; case 5: - baseWarpper.setName("跨城小件物流"); + baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville"); break; } maps.add(baseWarpper); @@ -811,8 +1172,14 @@ * @throws Exception */ @Override - public Map<String, Object> queryInfo(Integer uid) throws Exception { + public Map<String, Object> queryInfo(Integer language, Integer uid) throws Exception { Map<String, Object> map = driverMapper.queryInfo(uid); + String birthday = map.get("birthday").toString(); + map.put("birthday", DateUtil.conversionFormat(language, birthday)); + String networkCarlssueDate = map.get("networkCarlssueDate").toString(); + map.put("networkCarlssueDate", DateUtil.conversionFormat(language, networkCarlssueDate)); + String getDriverLicenseDate = map.get("getDriverLicenseDate").toString(); + map.put("getDriverLicenseDate", DateUtil.conversionFormat(language, getDriverLicenseDate)); if(ToolUtil.isEmpty(map.get("qrCode"))){ //获取小程序二维码 Driver driver = new Driver(); @@ -834,17 +1201,18 @@ * @throws Exception */ @Override - public ResultUtil updatePhone(String phone, String code, Integer uid) throws Exception { + public ResultUtil updatePhone(String phoneOperator, String phone, String code, Integer uid, Integer language) throws Exception { Driver driver = driverMapper.queryByPhone(phone); if(null != driver){ - return ResultUtil.error("电话号码已被注册"); + return ResultUtil.error(language == 1 ? "电话号码已被注册" : language == 2 ? "Mobile phone number has been registered." : "Le numéro de téléphone portable a été enregistré."); } - boolean b = this.checkCaptcha(phone, code); + boolean b = this.checkCaptcha("", phone, code); if(!b){ - return ResultUtil.error("验证码无效"); + return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide"); } Driver driver1 = this.selectById(uid); driver1.setAccount(phone); + driver1.setPhoneOperator(phoneOperator); driver1.setPhone(phone); this.updateById(driver1); @@ -879,10 +1247,106 @@ * @throws Exception */ @Override - public void updatePassword(String password, Integer uid) throws Exception { + public void updatePassword(String password, Integer uid, Integer language) throws Exception { Driver driver = this.selectById(uid); driver.setPassword(ShiroKit.md5(password, salt)); this.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("user").remove(); + document1.getElementById("settle").remove(); + document1.getElementById("email").remove(); + document1.getElementById("bill").remove(); + document1.getElementById("reward").remove(); + document1.getElementById("rewardToday").remove(); + document1.getElementById("driverAudit").remove(); + document1.getElementById("carAudit").remove(); + + Element pass_user = document1.getElementById("pass_user"); + pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ","); + } + if(2 == language){ + document1.getElementById("chinese").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite1").remove(); + document1.getElementById("user1").remove(); + document1.getElementById("settle1").remove(); + document1.getElementById("email1").remove(); + document1.getElementById("bill1").remove(); + document1.getElementById("reward1").remove(); + document1.getElementById("rewardToday1").remove(); + document1.getElementById("driverAudit1").remove(); + document1.getElementById("carAudit1").remove(); + + Element pass1_user = document1.getElementById("pass1_user"); + pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ","); + } + if(3 == language){ + document1.getElementById("chinese").remove(); + document1.getElementById("english").remove(); + document1.getElementById("invite2").remove(); + document1.getElementById("user2").remove(); + document1.getElementById("settle2").remove(); + document1.getElementById("email2").remove(); + document1.getElementById("bill2").remove(); + document1.getElementById("reward2").remove(); + document1.getElementById("rewardToday2").remove(); + document1.getElementById("driverAudit2").remove(); + document1.getElementById("carAudit2").remove(); + + Element pass2_user = document1.getElementById("pass2_user"); + pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); + } + 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/"); + if(!file.exists()){ + file.mkdirs(); + } + file = new File("/usr/local/nginx/html/files/html/reset_" + randomString + ".html"); + if(!file.exists()){ + file.createNewFile(); + } + FileWriter fileWriter = new FileWriter(file); + 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.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); + } } @@ -894,14 +1358,27 @@ * @throws Exception */ @Override - public ResultUtil replaceCar(Integer carId, Integer uid) throws Exception { + public ResultUtil replaceCar(Integer carId, Integer uid, Integer language) throws Exception { Driver driver = this.selectById(uid); if(driver.getState() == 3){ - return ResultUtil.error("还在服务中,不能更换"); + return ResultUtil.error(language == 1 ? "还在服务中,不能更换" : language == 2 ? "On trip, unable to change." : "En service, il est impossible de se changer."); + } + Car car = carService.selectById(carId); + if(null == car){ + return ResultUtil.error(language == 1 ? "车辆无效" : language == 2 ? "Invalid vehicle" : "Véhicule non valide"); + } + if(car.getAuthState() == 1){ + return ResultUtil.error(language == 1 ? "车辆正在审核中" : language == 2 ? "Vehicle is being reviewed." : "Le véhicule est en cours d’examen."); + } + if(car.getAuthState() == 3){ + return ResultUtil.error(language == 1 ? "车辆已冻结" : language == 2 ? "Vehicle is frozen." : "Le véhicule est gelé."); + } + if(car.getAuthState() == 4){ + return ResultUtil.error(language == 1 ? "车辆审核不通过" : language == 2 ? "Vehicle is not verified and qualified." : "Le véhicule n’est pas vérifié ni qualifié."); } boolean idle = carService.idle(carId); if(!idle){ - return ResultUtil.error("车辆已被绑定了"); + return ResultUtil.error(language == 1 ? "车辆已被绑定了" : language == 2 ? "Vehicle has been bound." : "Le véhicule a été connecté."); } driver.setCarId(carId); this.updateById(driver); @@ -973,8 +1450,8 @@ * @throws Exception */ @Override - public List<Map<String, Object>> queryPenalties(Integer pageNum, Integer size, Integer uid) throws Exception { - List<Map<String, Object>> list = reassignService.queryList(uid, pageNum, size); + public List<Map<String, Object>> queryPenalties(Integer language, Integer pageNum, Integer size, Integer uid) throws Exception { + List<Map<String, Object>> list = reassignService.queryList(language, uid, pageNum, size); return list; } @@ -988,8 +1465,8 @@ * @throws Exception */ @Override - public List<Map<String, Object>> queryActivityIncome(Integer uid, Integer pageNum, Integer size) throws Exception { - List<Map<String, Object>> query = incomeService.query(2, uid, 1, pageNum, size); + public List<Map<String, Object>> queryActivityIncome(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception { + List<Map<String, Object>> query = incomeService.query(language,2, uid, 1, pageNum, size); return query; } @@ -1003,8 +1480,8 @@ * @throws Exception */ @Override - public List<Map<String, Object>> queryTotalRevenue(Integer uid, Integer pageNum, Integer size) throws Exception { - List<Map<String, Object>> query = incomeService.query(2, uid, 2, pageNum, size); + public List<Map<String, Object>> queryTotalRevenue(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception { + List<Map<String, Object>> query = incomeService.query(language, 2, uid, 2, pageNum, size); return query; } @@ -1016,54 +1493,65 @@ * @throws Exception */ @Override - public List<ActivityWarpper> queryMyActivity(Integer uid, Date time) throws Exception { + public List<ActivityWarpper> queryMyActivity(Integer uid, Date time, Integer language) throws Exception { List<ActivityWarpper> list = new ArrayList<>(); Map<String, Date> date = dateUtil.getStartAndEndDate(time); List<DriverActivityHistory> driverActivityHistories = driverActivityHistoryMapper.queryList(uid, null, null, date.get("startTime"), date.get("endTime")); + + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd"); for(DriverActivityHistory dah : driverActivityHistories){ ActivityWarpper activityWarpper = new ActivityWarpper(); switch (dah.getType()){ case 1://邀请司机注册 DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredMapper.selectById(dah.getActivityId()); activityWarpper.setId(driverActivityRegistered.getId()); - activityWarpper.setContent("邀请司机注册奖励" + driverActivityRegistered.getMoney() + "元"); + activityWarpper.setContent(language == 1 ? "邀请司机注册奖励" + driverActivityRegistered.getMoney() + "元" : + language == 2 ? "Invitation driver registration reward " + driverActivityRegistered.getMoney() + " yuan" : + "Invitation pilote inscription récompense " + driverActivityRegistered.getMoney() + " yuan"); break; case 2://邀请用户注册 DriverActivityRegistered driverActivityRegistered1 = driverActivityRegisteredMapper.selectById(dah.getActivityId()); activityWarpper.setId(driverActivityRegistered1.getId()); - activityWarpper.setContent("邀请用户注册奖励" + driverActivityRegistered1.getMoney() + "元"); + activityWarpper.setContent(language == 1 ? "邀请用户注册奖励" + driverActivityRegistered1.getMoney() + "元" : + language == 2 ? "Invite users to register and reward " + driverActivityRegistered1.getMoney() + " yuan" : + "Bonus de " + driverActivityRegistered1.getMoney() + " $pour les utilisateurs invités à s’inscrire"); break; case 3://累计在线 DriverActivityOnline driverActivityOnline = driverActivityOnlineMapper.selectById(dah.getActivityId()); activityWarpper.setId(driverActivityOnline.getId()); - StringBuffer sb = new StringBuffer("今日"); - DriverWork driverWork = driverWorkMapper.queryNewWork(uid, driverActivityOnline.getType(), 1); + StringBuffer sb = new StringBuffer(language == 1 ? "今日" : + language == 2 ? " today " : " aujourd’hui "); + DriverOnline query = driverOnlineMapper.query(uid, sdf1.format(new Date()), 0); Integer hour = 0; - if(null != driverWork){ - hour = Long.valueOf((System.currentTimeMillis() - driverWork.getStartTime().getTime()) / 3600000).intValue(); + if(null != query){ + hour = Long.valueOf(query.getDuration() / 3600).intValue(); } switch (driverActivityOnline.getType()){ case 1: - sb.append("专车"); + sb.append(language == 1 ? "打车" : language == 2 ? "Ride" : "Course"); break; case 2: sb.append("出租车"); - - break; + continue; case 3: sb.append("城际出行"); - break; + continue; case 4: + sb.append(language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison"); break; } - String str = "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元"; + String str = language == 1 ? "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元" : + language == 2 ? " RMB " + driverActivityOnline.getMoney() + " will be awarded for " + driverActivityOnline.getOnline() + " hours online" : + " Bonus de " + driverActivityOnline.getMoney() + " $pour " + driverActivityOnline.getOnline() + " heures cumulées en ligne"; activityWarpper.setContent(sb.append(str).toString()); activityWarpper.setCarryOut((dah.getCarryOut() == 2 || hour > driverActivityOnline.getOnline()) ? driverActivityOnline.getOnline() + "/" +driverActivityOnline.getOnline() : hour + "/" + driverActivityOnline.getOnline()); break; case 4://订单量 DriverActivityOrder driverActivityOrder = driverActivityOrderMapper.selectById(dah.getActivityId()); activityWarpper.setId(driverActivityOrder.getId()); - activityWarpper.setContent("今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励" + driverActivityOrder.getMoney() + "元"); + activityWarpper.setContent(language == 1 ? "今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励" + driverActivityOrder.getMoney() + "元" : + language == 2 ? "From " + driverActivityOrder.getStart() + " to " + driverActivityOrder.getEnd() + " today, a total of " + driverActivityOrder.getOrderNum() + " orders will be awarded " + driverActivityOrder.getMoney() + " yuan" : + "De " + driverActivityOrder.getStart() + " à " + driverActivityOrder.getEnd() + " aujourd’hui, un total de " + driverActivityOrder.getOrderNum() + " commandes recevront " + driverActivityOrder.getMoney() + " yuans"); SimpleDateFormat sdf = new SimpleDateFormat("H:m"); Date start = sdf.parse(driverActivityOrder.getStart()); Date end = sdf.parse(driverActivityOrder.getEnd()); @@ -1097,6 +1585,7 @@ @Override public void addTodayActivity() throws Exception { List<Company> companies = companyMapper.selectList(new EntityWrapper<Company>().eq("state", 0).ne("flag", 3)); + Integer language = 2; //获取每个企业的活动数据 for(Company company : companies){ //企业下的所有司机 @@ -1114,6 +1603,115 @@ driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money")))); driverActivityHistory.setInsertTime(new Date()); driverActivityHistoryMapper.insert(driverActivityHistory); + + if(ToolUtil.isNotEmpty(driver.getEmail())) { + String path1 = templatePath + "driver/index.html"; + Document document1 = Jsoup.parse(new File(path1), "UTF-8"); + if (1 == language) { + document1.getElementById("english").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite").remove(); + document1.getElementById("user").remove(); + document1.getElementById("settle").remove(); + document1.getElementById("pass").remove(); + document1.getElementById("email").remove(); + document1.getElementById("bill").remove(); + document1.getElementById("reward").remove(); + document1.getElementById("driverAudit").remove(); + document1.getElementById("carAudit").remove(); + + 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平台。"); + } + if (2 == language) { + document1.getElementById("chinese").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite1").remove(); + document1.getElementById("user1").remove(); + document1.getElementById("settle1").remove(); + document1.getElementById("pass1").remove(); + document1.getElementById("email1").remove(); + document1.getElementById("bill1").remove(); + document1.getElementById("reward1").remove(); + document1.getElementById("driverAudit1").remove(); + document1.getElementById("carAudit1").remove(); + + Element rewardToday1_user = document1.getElementById("rewardToday1_user"); + rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ","); + 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."); + } + if (3 == language) { + document1.getElementById("chinese").remove(); + document1.getElementById("english").remove(); + document1.getElementById("invite2").remove(); + document1.getElementById("user2").remove(); + document1.getElementById("settle2").remove(); + document1.getElementById("pass2").remove(); + document1.getElementById("email2").remove(); + document1.getElementById("bill2").remove(); + document1.getElementById("reward2").remove(); + document1.getElementById("driverAudit2").remove(); + document1.getElementById("carAudit2").remove(); + + Element rewardToday2_user = document1.getElementById("rewardToday2_user"); + rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); + 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."); + } + EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui", document1.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/activity_" + randomString + ".html"); + if(!file.exists()){ + file.createNewFile(); + } + FileWriter fileWriter = new FileWriter(file); + 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 activity" : "l'événement d'aujourd'hui"); + 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); + } } } //邀请用户注册 @@ -1129,11 +1727,121 @@ driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money")))); driverActivityHistory.setInsertTime(new Date()); driverActivityHistoryMapper.insert(driverActivityHistory); + + if(ToolUtil.isNotEmpty(driver.getEmail())) { + String path1 = templatePath + "driver/index.html"; + Document document1 = Jsoup.parse(new File(path1), "UTF-8"); + if (1 == language) { + document1.getElementById("english").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite").remove(); + document1.getElementById("user").remove(); + document1.getElementById("settle").remove(); + document1.getElementById("pass").remove(); + document1.getElementById("email").remove(); + document1.getElementById("bill").remove(); + document1.getElementById("reward").remove(); + document1.getElementById("driverAudit").remove(); + document1.getElementById("carAudit").remove(); + + 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平台。"); + } + if (2 == language) { + document1.getElementById("chinese").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite1").remove(); + document1.getElementById("user1").remove(); + document1.getElementById("settle1").remove(); + document1.getElementById("pass1").remove(); + document1.getElementById("email1").remove(); + document1.getElementById("bill1").remove(); + document1.getElementById("reward1").remove(); + document1.getElementById("driverAudit1").remove(); + document1.getElementById("carAudit1").remove(); + + Element rewardToday1_user = document1.getElementById("rewardToday1_user"); + rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ","); + 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."); + } + if (3 == language) { + document1.getElementById("chinese").remove(); + document1.getElementById("english").remove(); + document1.getElementById("invite2").remove(); + document1.getElementById("user2").remove(); + document1.getElementById("settle2").remove(); + document1.getElementById("pass2").remove(); + document1.getElementById("email2").remove(); + document1.getElementById("bill2").remove(); + document1.getElementById("reward2").remove(); + document1.getElementById("driverAudit2").remove(); + document1.getElementById("carAudit2").remove(); + + Element rewardToday2_user = document1.getElementById("rewardToday2_user"); + rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); + 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."); + } + EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui", document1.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/activity_" + randomString + ".html"); + if(!file.exists()){ + file.createNewFile(); + } + FileWriter fileWriter = new FileWriter(file); + 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 activity" : "l'événement d'aujourd'hui"); + 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); + } } } //累计在线 query = driverActivityOnlineMapper.query(company.getId()); for(Map<String, Object> map : query){ + DriverActivityOnline driverActivityOnline = driverActivityOnlineMapper.selectById(Integer.valueOf(String.valueOf(map.get("id")))); for(Driver driver : drivers){ DriverActivityHistory driverActivityHistory = new DriverActivityHistory(); driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id")))); @@ -1144,11 +1852,121 @@ driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money")))); driverActivityHistory.setInsertTime(new Date()); driverActivityHistoryMapper.insert(driverActivityHistory); + + if(ToolUtil.isNotEmpty(driver.getEmail())) { + String path1 = templatePath + "driver/index.html"; + Document document1 = Jsoup.parse(new File(path1), "UTF-8"); + if (1 == language) { + document1.getElementById("english").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite").remove(); + document1.getElementById("user").remove(); + document1.getElementById("settle").remove(); + document1.getElementById("pass").remove(); + document1.getElementById("email").remove(); + document1.getElementById("bill").remove(); + document1.getElementById("reward").remove(); + document1.getElementById("driverAudit").remove(); + document1.getElementById("carAudit").remove(); + + 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平台。"); + } + if (2 == language) { + document1.getElementById("chinese").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite1").remove(); + document1.getElementById("user1").remove(); + document1.getElementById("settle1").remove(); + document1.getElementById("pass1").remove(); + document1.getElementById("email1").remove(); + document1.getElementById("bill1").remove(); + document1.getElementById("reward1").remove(); + document1.getElementById("driverAudit1").remove(); + document1.getElementById("carAudit1").remove(); + + Element rewardToday1_user = document1.getElementById("rewardToday1_user"); + rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ","); + 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."); + } + if (3 == language) { + document1.getElementById("chinese").remove(); + document1.getElementById("english").remove(); + document1.getElementById("invite2").remove(); + document1.getElementById("user2").remove(); + document1.getElementById("settle2").remove(); + document1.getElementById("pass2").remove(); + document1.getElementById("email2").remove(); + document1.getElementById("bill2").remove(); + document1.getElementById("reward2").remove(); + document1.getElementById("driverAudit2").remove(); + document1.getElementById("carAudit2").remove(); + + Element rewardToday2_user = document1.getElementById("rewardToday2_user"); + rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); + 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."); + } + EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui", document1.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/activity_" + randomString + ".html"); + if(!file.exists()){ + file.createNewFile(); + } + FileWriter fileWriter = new FileWriter(file); + 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 activity" : "l'événement d'aujourd'hui"); + 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); + } } } //订单量 query = driverActivityOrderMapper.query(company.getId()); for(Map<String, Object> map : query){ + DriverActivityOrder driverActivityOrder = driverActivityOrderMapper.selectById(Integer.valueOf(String.valueOf(map.get("id")))); for(Driver driver : drivers){ DriverActivityHistory driverActivityHistory = new DriverActivityHistory(); driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id")))); @@ -1159,6 +1977,115 @@ driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money")))); driverActivityHistory.setInsertTime(new Date()); driverActivityHistoryMapper.insert(driverActivityHistory); + + if(ToolUtil.isNotEmpty(driver.getEmail())) { + String path1 = templatePath + "driver/index.html"; + Document document1 = Jsoup.parse(new File(path1), "UTF-8"); + if (1 == language) { + document1.getElementById("english").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite").remove(); + document1.getElementById("user").remove(); + document1.getElementById("settle").remove(); + document1.getElementById("pass").remove(); + document1.getElementById("email").remove(); + document1.getElementById("bill").remove(); + document1.getElementById("reward").remove(); + document1.getElementById("driverAudit").remove(); + document1.getElementById("carAudit").remove(); + + 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平台。"); + } + if (2 == language) { + document1.getElementById("chinese").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite1").remove(); + document1.getElementById("user1").remove(); + document1.getElementById("settle1").remove(); + document1.getElementById("pass1").remove(); + document1.getElementById("email1").remove(); + document1.getElementById("bill1").remove(); + document1.getElementById("reward1").remove(); + document1.getElementById("driverAudit1").remove(); + document1.getElementById("carAudit1").remove(); + + Element rewardToday1_user = document1.getElementById("rewardToday1_user"); + rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ","); + 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."); + } + if (3 == language) { + document1.getElementById("chinese").remove(); + document1.getElementById("english").remove(); + document1.getElementById("invite2").remove(); + document1.getElementById("user2").remove(); + document1.getElementById("settle2").remove(); + document1.getElementById("pass2").remove(); + document1.getElementById("email2").remove(); + document1.getElementById("bill2").remove(); + document1.getElementById("reward2").remove(); + document1.getElementById("driverAudit2").remove(); + document1.getElementById("carAudit2").remove(); + + Element rewardToday2_user = document1.getElementById("rewardToday2_user"); + rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ","); + 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."); + } + EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui", document1.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/activity_" + randomString + ".html"); + if(!file.exists()){ + file.createNewFile(); + } + FileWriter fileWriter = new FileWriter(file); + 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 activity" : "l'événement d'aujourd'hui"); + 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); + } } } } @@ -1172,13 +2099,19 @@ @Override public void taskMinute() throws Exception { Map<String, Date> date = dateUtil.getStartAndEndDate(new Date()); + Integer language = 2; //在线时长 List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(null, 3, 1, date.get("startTime"), date.get("endTime")); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); for(DriverActivityHistory dah : list){ DriverActivityOnline dao = driverActivityOnlineMapper.selectById(dah.getActivityId()); - List<DriverWork> query = driverWorkMapper.query(dao.getType(), dao.getOnline());//满足活动条件的数据 - for(DriverWork dw : query){ - if(dah.getDriverId().compareTo(dw.getDriverId()) == 0){ + if(null == dao){ + continue; + } + Long duration = Long.valueOf(dao.getOnline() * 3600); + List<DriverOnline> driverOnlines = driverOnlineMapper.queryList(sdf.format(new Date()), duration); + for (DriverOnline driverOnline : driverOnlines) { + if(dah.getDriverId().compareTo(driverOnline.getDriverId()) == 0){ dah.setCarryOut(2);//完成状态 driverActivityHistoryMapper.updateById(dah); //修改余额 @@ -1192,7 +2125,111 @@ this.updateById(driver); //添加收入记录 - incomeService.saveData(2, dw.getDriverId(), 1, dao.getId(), null, dah.getMoney()); + incomeService.saveData(2, driverOnline.getDriverId(), 1, dao.getId(), null, dah.getMoney()); + + + if(ToolUtil.isNotEmpty(driver.getEmail())) { + String path1 = templatePath + "driver/index.html"; + Document document1 = Jsoup.parse(new File(path1), "UTF-8"); + if (1 == language) { + document1.getElementById("english").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite").remove(); + document1.getElementById("user").remove(); + document1.getElementById("settle").remove(); + document1.getElementById("pass").remove(); + document1.getElementById("email").remove(); + document1.getElementById("bill").remove(); + document1.getElementById("rewardToday").remove(); + document1.getElementById("driverAudit").remove(); + document1.getElementById("carAudit").remove(); + + 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() + ",请查收"); + } + if (2 == language) { + document1.getElementById("chinese").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite1").remove(); + document1.getElementById("user1").remove(); + document1.getElementById("settle1").remove(); + document1.getElementById("pass1").remove(); + document1.getElementById("email1").remove(); + document1.getElementById("bill1").remove(); + document1.getElementById("rewardToday1").remove(); + document1.getElementById("driverAudit1").remove(); + document1.getElementById("carAudit1").remove(); + + 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"); + } + if (3 == language) { + document1.getElementById("chinese").remove(); + document1.getElementById("english").remove(); + document1.getElementById("invite2").remove(); + document1.getElementById("user2").remove(); + document1.getElementById("settle2").remove(); + document1.getElementById("pass2").remove(); + document1.getElementById("email2").remove(); + document1.getElementById("bill2").remove(); + document1.getElementById("rewardToday2").remove(); + document1.getElementById("driverAudit2").remove(); + document1.getElementById("carAudit2").remove(); + + Element reward2_user = document1.getElementById("reward2_user"); + reward2_user.text("Bonjour " + 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"); + } + EmailUtil.send(driver.getEmail(), language == 1 ? "在线时长奖励" : language == 2 ? "Online Time Rewards" : "Récompenses de temps en ligne", document1.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/rewards_" + randomString + ".html"); + if(!file.exists()){ + file.createNewFile(); + } + FileWriter fileWriter = new FileWriter(file); + 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 Time Rewards" : "Récompenses de temps en ligne"); + 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); + } } } } @@ -1217,6 +2254,110 @@ //添加收入记录 incomeService.saveData(2, dah.getDriverId(), 1, dao.getId(), null, dah.getMoney()); + + if(ToolUtil.isNotEmpty(driver.getEmail())) { + String path1 = templatePath + "driver/index.html"; + Document document1 = Jsoup.parse(new File(path1), "UTF-8"); + if (1 == language) { + document1.getElementById("english").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite").remove(); + document1.getElementById("user").remove(); + document1.getElementById("settle").remove(); + document1.getElementById("pass").remove(); + document1.getElementById("email").remove(); + document1.getElementById("bill").remove(); + document1.getElementById("rewardToday").remove(); + document1.getElementById("driverAudit").remove(); + document1.getElementById("carAudit").remove(); + + 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() + ",请查收"); + } + if (2 == language) { + document1.getElementById("chinese").remove(); + document1.getElementById("french").remove(); + document1.getElementById("invite1").remove(); + document1.getElementById("user1").remove(); + document1.getElementById("settle1").remove(); + document1.getElementById("pass1").remove(); + document1.getElementById("email1").remove(); + document1.getElementById("bill1").remove(); + document1.getElementById("rewardToday1").remove(); + document1.getElementById("driverAudit1").remove(); + document1.getElementById("carAudit1").remove(); + + 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"); + } + if (3 == language) { + document1.getElementById("chinese").remove(); + document1.getElementById("english").remove(); + document1.getElementById("invite2").remove(); + document1.getElementById("user2").remove(); + document1.getElementById("settle2").remove(); + document1.getElementById("pass2").remove(); + document1.getElementById("email2").remove(); + document1.getElementById("bill2").remove(); + document1.getElementById("rewardToday2").remove(); + document1.getElementById("driverAudit2").remove(); + document1.getElementById("carAudit2").remove(); + + Element reward2_user = document1.getElementById("reward2_user"); + reward2_user.text("Bonjour " + 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"); + } + + EmailUtil.send(driver.getEmail(), language == 1 ? "累计接单奖励" : language == 2 ? "Cumulative Order Rewards" : "Récompenses de commande cumulées", document1.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/rewards_" + randomString + ".html"); + if(!file.exists()){ + file.createNewFile(); + } + FileWriter fileWriter = new FileWriter(file); + 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 Order Rewards" : "Récompenses de commande cumulées"); + 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); + } } } } @@ -1227,16 +2368,16 @@ * @return */ @Override - public ResultUtil loginByJobNumber(String jobNum) { + public ResultUtil loginByJobNumber(String jobNum, Integer language) { Driver driver = driverMapper.queryByJobNum(jobNum); if(null == driver){ - return ResultUtil.error("账号未注册,请先注册账号"); + return ResultUtil.error(language == 1 ? "账号未注册,请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte."); } if(driver.getAuthState() == 1){ - return ResultUtil.error("账号正在审核中,请耐心等待"); + return ResultUtil.error(language == 1 ? "账号正在审核中,请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter."); } if(driver.getAuthState() == 3){ - return ResultUtil.error("账号已被冻结,请联系管理员"); + return ResultUtil.error(language == 1 ? "账号已被冻结,请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur."); } List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId()); boolean b = true; @@ -1247,7 +2388,7 @@ } } if(b){ - return ResultUtil.error("没有出租车业务权限"); + return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course"); } //开始自动设置接单类型,出车类型,上班状态 @@ -1325,16 +2466,16 @@ * @throws Exception */ @Override - public ResultUtil loginByIdentification(String identification) throws Exception { + public ResultUtil loginByIdentification(String identification, Integer language) throws Exception { Driver driver = driverMapper.queryByIdentification(identification); if(null == driver){ - return ResultUtil.error("账号未注册,请先注册账号"); + return ResultUtil.error(language == 1 ? "账号未注册,请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte."); } if(driver.getAuthState() == 1){ - return ResultUtil.error("账号正在审核中,请耐心等待"); + return ResultUtil.error(language == 1 ? "账号正在审核中,请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter."); } if(driver.getAuthState() == 3){ - return ResultUtil.error("账号已被冻结,请联系管理员"); + return ResultUtil.error(language == 1 ? "账号已被冻结,请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur."); } List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId()); boolean b = true; @@ -1345,7 +2486,7 @@ } } if(b){ - return ResultUtil.error("没有出租车业务权限"); + return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course"); } //开始自动设置接单类型,出车类型,上班状态 @@ -1411,16 +2552,16 @@ * @throws Exception */ @Override - public ResultUtil loginByTaxiAptitudeCard(String taxiAptitudeCard) throws Exception { + public ResultUtil loginByTaxiAptitudeCard(String taxiAptitudeCard, Integer language) throws Exception { Driver driver = driverMapper.queryByTaxiAptitudeCard(taxiAptitudeCard); if(null == driver){ - return ResultUtil.error("账号未注册,请先注册账号"); + return ResultUtil.error(language == 1 ? "账号未注册,请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte."); } if(driver.getAuthState() == 1){ - return ResultUtil.error("账号正在审核中,请耐心等待"); + return ResultUtil.error(language == 1 ? "账号正在审核中,请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter."); } if(driver.getAuthState() == 3){ - return ResultUtil.error("账号已被冻结,请联系管理员"); + return ResultUtil.error(language == 1 ? "账号已被冻结,请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur."); } List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId()); boolean b = true; @@ -1431,7 +2572,7 @@ } } if(b){ - return ResultUtil.error("没有出租车业务权限"); + return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course"); } //开始自动设置接单类型,出车类型,上班状态 @@ -1517,13 +2658,13 @@ * @throws Exception */ @Override - public ResultUtil verificationPassword(String password, Integer driverId) throws Exception { + public ResultUtil verificationPassword(String password, Integer driverId, Integer language) throws Exception { Driver driver = this.selectById(driverId); if(null == driver){ - return ResultUtil.error("账户无效,请重新登录"); + return ResultUtil.error(language == 1 ? "账户无效,请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau."); } if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){ - return ResultUtil.error("密码错误"); + return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné"); } return ResultUtil.success(); } @@ -1536,10 +2677,10 @@ * @throws Exception */ @Override - public ResultUtil setWithdrawPassword(String withdrawPassword, Integer driverId) throws Exception { + public ResultUtil setWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception { Driver driver = this.selectById(driverId); if(null == driver){ - return ResultUtil.error("账户无效,请重新登录"); + return ResultUtil.error(language == 1 ? "账户无效,请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau."); } driver.setWithdrawPassword(ShiroKit.md5(withdrawPassword, salt)); this.updateById(driver); @@ -1555,16 +2696,16 @@ * @throws Exception */ @Override - public ResultUtil verificationWithdrawPassword(String withdrawPassword, Integer driverId) throws Exception { + public ResultUtil verificationWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception { Driver driver = this.selectById(driverId); if(null == driver){ - return ResultUtil.error("账户无效,请重新登录"); + return ResultUtil.error(language == 1 ? "账户无效,请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau."); } if(null == driver.getWithdrawPassword()){ - return ResultUtil.error("请先设置提现密码"); + return ResultUtil.error(language == 1 ? "请先设置提现密码" : language == 2 ? "Please set withdrawal password first." : "Veuillez d’abord définir le mot de passe de retrait."); } if(!driver.getWithdrawPassword().equals(ShiroKit.md5(withdrawPassword, salt))){ - return ResultUtil.error("密码错误"); + return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné"); } return ResultUtil.success(); } @@ -1600,14 +2741,24 @@ * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>> */ @Override - public List<Map<String,Object>> queryMyInviteList(Integer type,Integer uid, Integer pageNum, Integer size) throws Exception { + public List<Map<String,Object>> queryMyInviteList(Integer language, Integer type,Integer uid, Integer pageNum, Integer size) throws Exception { pageNum = (pageNum - 1) * size; if(type==1){ //乘客表uType为2表示是司机邀请的 - return userInfoMapper.queryMyInviteUserList(2,uid,pageNum,size); + List<Map<String, Object>> list = userInfoMapper.queryMyInviteUserList(2, uid, pageNum, size); + for (Map<String, Object> map : list) { + String insertTime = map.get("insertTime").toString(); + map.put("insertTime", DateUtil.conversionFormat(language, insertTime)); + } + return list; }else if(type==2){ //司机表uType为2表示是司机邀请的 - return driverMapper.queryMyInviteDriverList(2,uid, pageNum, size); + List<Map<String, Object>> list = driverMapper.queryMyInviteDriverList(2, uid, pageNum, size); + for (Map<String, Object> map : list) { + String insertTime = map.get("insertTime").toString(); + map.put("insertTime", DateUtil.conversionFormat(language, insertTime)); + } + return list; } return null; @@ -1670,6 +2821,7 @@ redisUtil.remove("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存 redisUtil.remove("DRIVER_" + id);//清除存储的token } + } @Override -- Gitblit v1.7.1