java/IgoTravel.git

			@@ -17,9 +17,8 @@
			import com.stylefeng.guns.modular.system.model.*;
			import com.stylefeng.guns.modular.system.service.*;
			import com.stylefeng.guns.modular.system.util.*;
			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.GoogleMap.*;
			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;
			@@ -27,6 +26,7 @@
			import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
			import org.apache.shiro.crypto.hash.Md5Hash;
			import org.apache.shiro.util.ByteSource;
			import org.apache.shiro.util.StringUtils;
			import org.jsoup.Jsoup;
			import org.jsoup.nodes.Document;
			import org.jsoup.nodes.Element;
			@@ -36,7 +36,7 @@

			import javax.annotation.Resource;
			import javax.servlet.http.HttpServletRequest;
			import java.io.File;
			import java.io.*;
			import java.math.BigDecimal;
			import java.text.SimpleDateFormat;
			import java.util.*;
			@@ -143,6 +143,23 @@

			private String salt = "SA;d5#";

			@Autowired
			private SMSUtil smsUtil;


			@Autowired
			private TEmailService emailService;

			@Autowired
			private FleetEngineUtil fleetEngineUtil;


			@Resource
			private CarModelMapper carModelMapper;

			@Autowired
			private ISettlementRecordService settlementRecordService;


			@Override
			public Integer getAppOpenInfo(Integer type) {
			@@ -162,29 +179,45 @@
			*/
			@Override
			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 templateId = "";
			switch (language){
			case 1:
			templateId = "b793ae3d41a049059197bfe92cf8bc83";
			// sms = "您的验证码为：" + authCode + "，该验证码5分钟内有效，请勿泄漏于他人！";
			sms = "Your verification code is " + authCode + ", it is valid within 5 minutes, please do not reveal it to others.";
			break;
			case 2:
			templateId = "058c7d11ce594d668841cceb49fb5c9a";
			sms = "Your verification code is " + authCode + ", it is valid within 5 minutes, please do not reveal it to others.";
			break;
			case 3:
			templateId = "4edbe604da6546808ffda582085b3c83";
			sms = "Votre code de validation est " + authCode + " et il est valide pendant 5 minutes. Veuillez ne pas le révéler à d’autres personnes.";
			break;
			}
			SMSUtil.send_huawei_sms(templateId, "+" + phone, "[\"" + authCode + "\"]");
			smsUtil.sendCellulantMessage(phone, sms);
			smsrecordService.saveData(type, phone, authCode, sms);
			System.out.println(sms);
			return ResultUtil.success();
			}
			@@ -202,7 +235,7 @@
			//发送验证码短信
			redisUtil.setStrValue(email, authCode, 5 * 60);//设置五分钟过期

			String path = templatePath + "index.html";
			String path = templatePath + "driver/index.html";
			Document document = Jsoup.parse(new File(path), "UTF-8");
			if(1 == language){
			document.getElementById("english").remove();
			@@ -217,10 +250,11 @@
			document.getElementById("driverAudit").remove();
			document.getElementById("carAudit").remove();

			document.getElementsByTag("title").get(0).text("邮箱验证");
			Element email_user = document.getElementById("email_user");
			email_user.text("您好，");
			Element email_content = document.getElementById("email_content");
			email_content.text("邮件验证码是：" + authCode + "，请在5分钟内完成验证");
			email_content.text("您正在绑定邮箱，本次请求的邮件验证码是：" + authCode + "，请在5分钟内完成验证");
			}
			if(2 == language){
			document.getElementById("chinese").remove();
			@@ -235,10 +269,11 @@
			document.getElementById("driverAudit1").remove();
			document.getElementById("carAudit1").remove();

			document.getElementsByTag("title").get(0).text("Verification code");
			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.");
			email1_content.text("Your delivery pickup code is " + authCode + ", please complete the verification within 5 minutes");
			}
			if(3 == language){
			document.getElementById("chinese").remove();
			@@ -253,12 +288,13 @@
			document.getElementById("driverAudit2").remove();
			document.getElementById("carAudit2").remove();

			document.getElementsByTag("title").get(0).text("Code de validation");
			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");
			email2_content.text("Le code de ramassage de votre livraison est " + authCode + ", veuillez effectuer la verification dans les 5minutes.");
			}
			EmailUtil.send(email, language == 1 ? "验证码" : language == 2 ? "Verification code" : "Code de vérification", document.html());
			EmailUtil.send(email, language == 1 ? "邮箱验证" : language == 2 ? "Verification code" : "Code de validation", document.html());
			return ResultUtil.success();
			}

			@@ -272,10 +308,10 @@
			@Override
			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{
			@@ -290,25 +326,28 @@
			*/
			@Override
			public ResultUtil registeredDriver(String phoneOperator, String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language) throws Exception {
			Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据
			ResultUtil<LoginWarpper> result = this.registeredDriver(phoneOperator, phone, code, password,uid,type, language);
			if(result.getCode() == 200 && null != uid){
			if(null == driver1 && result.getCode() == 200 && null != uid){
			if(type == 2){
			Driver driver = driverMapper.selectById(uid);
			List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
			Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
			List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(null, 1, 1, date.get("startTime"), date.get("endTime"));
			BigDecimal bigDecimal = new BigDecimal("0");
			for(Map<String, Object> map : query){
			if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
			bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
			incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));
			}
			for (DriverActivityHistory driverActivityHistory : list) {
			bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
			incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
			driverActivityHistory.setCarryOut(2);
			driverActivityHistory.setCompletionTime(new Date());
			driverActivityHistoryMapper.updateById(driverActivityHistory);
			}
			driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driverMapper.updateById(driver);

			if(ToolUtil.isNotEmpty(driver.getEmail())){
			String path = templatePath + "index.html";
			if(list.size() > 0 && 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();
			@@ -323,6 +362,7 @@
			document.getElementById("driverAudit").remove();
			document.getElementById("carAudit").remove();

			document.getElementsByTag("title").get(0).text("司机奖励通知");
			Element invite_user = document.getElementById("invite_user");
			invite_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element invite_content = document.getElementById("invite_content");
			@@ -341,6 +381,7 @@
			document.getElementById("driverAudit1").remove();
			document.getElementById("carAudit1").remove();

			document.getElementsByTag("title").get(0).text("Reward-driver notice");
			Element invite1_user = document.getElementById("invite1_user");
			invite1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element invite1_content = document.getElementById("invite1_content");
			@@ -359,12 +400,45 @@
			document.getElementById("driverAudit2").remove();
			document.getElementById("carAudit2").remove();

			document.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
			Element invite2_user = document.getElementById("invite2_user");
			invite2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
			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());
			EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document.html());
			String randomString = ToolUtil.getRandomString(10);
			//开始生成pdf收据和html收据
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/home/igotechgh/nginx/html/files/html/invitation_" + randomString + ".html");
			if(!file.exists()){
			file.createNewFile();
			}
			FileWriter fileWriter = new FileWriter(file);
			fileWriter.write(document.html());
			fileWriter.flush();
			fileWriter.close();

			String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(driver.getId());
			tEmail.setType(2);
			tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			String week = EmailUtil.getWeek(language, i);
			tEmail.setWeek(week);
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);
			}

			}
			@@ -399,6 +473,207 @@
			}








			/**
			* 司机提交注册申请
			* @throws Exception
			*/
			@Override
			public ResultUtil registeredDriver1(String phoneOperator, String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language) throws Exception {
			boolean b = this.checkCaptcha("", phone, code);
			if(!b){
			return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
			}
			Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据
			if(null != driver1){
			driver1.setAuthState(1);
			driverMapper.updateById(driver1);
			return ResultUtil.success();
			}

			driver1 = driverMapper.queryByPhone(phone);
			if(null != driver1){
			return ResultUtil.error(language == 1 ? "手机号已被注册" : language == 2 ? "The mobile phone number has been registered" : "Le numéro de téléphone portable a été enregistré");
			}
			Driver driver = new Driver();
			driver.setAccount(phone);
			driver.setJobNumber(getCode());
			driver.setPhoneOperator(phoneOperator);
			driver.setPhone(phone);
			driver.setPassword(ShiroKit.md5(password, salt));
			driver.setAuthState(1);
			driver.setState(1);
			driver.setInsertTime(new Date());
			driver.setAddType(1);
			driver.setBalance(0D);
			if(null!=uid){
			driver.setUid(uid);
			}
			if(null!=type){
			driver.setuType(type);
			}
			this.insert(driver);
			if(null != uid){
			if(type == 2){
			driver = driverMapper.selectById(uid);
			Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
			List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(uid, 1, 1, date.get("startTime"), date.get("endTime"));
			BigDecimal bigDecimal = new BigDecimal("0");
			for (DriverActivityHistory driverActivityHistory : list) {
			bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
			incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
			driverActivityHistory.setCarryOut(2);
			driverActivityHistory.setCompletionTime(new Date());
			driverActivityHistoryMapper.updateById(driverActivityHistory);
			}
			driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			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(list.size() > 0 && ToolUtil.isNotEmpty(driver.getEmail())){
			Driver finalDriver = driver;
			BigDecimal finalBigDecimal = bigDecimal;
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			String path = templatePath + "driver/index.html";
			Document document = Jsoup.parse(new File(path), "UTF-8");
			if(1 == language){
			document.getElementById("english").remove();
			document.getElementById("french").remove();
			document.getElementById("user").remove();
			document.getElementById("settle").remove();
			document.getElementById("pass").remove();
			document.getElementById("email").remove();
			document.getElementById("bill").remove();
			document.getElementById("reward").remove();
			document.getElementById("rewardToday").remove();
			document.getElementById("driverAudit").remove();
			document.getElementById("carAudit").remove();

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

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

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

			String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(finalDriver.getId());
			tEmail.setType(2);
			tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			String week = EmailUtil.getWeek(language, i);
			tEmail.setWeek(week);
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);
			}catch (Exception e){
			e.printStackTrace();
			}
			}
			}).start();
			}

			}
			if(type == 1){//用户分享
			UserInfo userInfo = userInfoMapper.selectById(uid);
			List<Map<String, Object>> query = userActivityInviteMapper.query(userInfo.getCompanyId());
			Date date = new Date();
			for(Map<String, Object> map : query){
			for(int i = Integer.valueOf(String.valueOf(map.get("totalNum"))); i > 0; i--){
			UserCouponRecord userCouponRecord = new UserCouponRecord();
			userCouponRecord.setActivityType(3);
			userCouponRecord.setCouponActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
			userCouponRecord.setCouponId(Integer.valueOf(String.valueOf(map.get("couponId"))));
			userCouponRecord.setState(1);
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(date);
			calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + Integer.valueOf(String.valueOf(map.get("effective"))));
			userCouponRecord.setExpirationTime(calendar.getTime());
			userCouponRecord.setCouponType(Integer.valueOf(String.valueOf(map.get("couponType"))));
			userCouponRecord.setCouponUseType(Integer.valueOf(String.valueOf(map.get("couponUseType"))));
			userCouponRecord.setInsertTime(date);
			userCouponRecord.setFullMoney(Double.valueOf(String.valueOf(map.get("fullMoney"))));
			userCouponRecord.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
			userCouponRecord.setCompanyId(userInfo.getCompanyId());
			userCouponRecord.setUserId(uid);
			userCouponRecordMapper.insert(userCouponRecord);
			}
			}
			}
			}
			return ResultUtil.success();
			}


			/**
			* 司机注册
			* @param phone
			@@ -413,7 +688,7 @@
			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(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
			return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
			}

			Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据
			@@ -424,7 +699,6 @@
			loginWarpper.setId(driver1.getId());
			return ResultUtil.success(loginWarpper);
			}


			driver1 = driverMapper.queryByPhone(phone);
			if(null != driver1){
			@@ -488,7 +762,7 @@
			String[] city = new String[]{city1.getEnglishName()};
			Company query = companyCityService.query(city);
			if(null == query){
			return ResultUtil.error(language == 1 ? "选择从业地暂未开通业务" : language == 2 ? "The selected place of employment has not yet opened business" : "Choisir un lieu de pratique pas encore ouvert");
			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()){
			@@ -514,13 +788,14 @@
			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.setGetDriverLicenseDate(registeredWarpper.getGetDriverLicenseDate());
			driver.setDriveCardImgUrl1(registeredWarpper.getDriveCardImgUrl());
			driver.setDriveCardImgUrl2(registeredWarpper.getDriveCardImgUrl2());
			driver.setDriveCard(registeredWarpper.getDriveCard());
			driver.setEmail(registeredWarpper.getEmail());

			this.updateById(driver);
			@@ -546,7 +821,7 @@
			}

			if(ToolUtil.isNotEmpty(driver.getEmail())){
			String path1 = templatePath + "index.html";
			String path1 = templatePath + "driver/index.html";
			Document document1 = Jsoup.parse(new File(path1), "UTF-8");
			if(1 == language){
			document1.getElementById("english").remove();
			@@ -561,6 +836,7 @@
			document1.getElementById("driverAudit").remove();
			document1.getElementById("carAudit").remove();

			document1.getElementsByTag("title").get(0).text("成功注册");
			Element settle_user = document1.getElementById("settle_user");
			settle_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
			}
			@@ -577,6 +853,7 @@
			document1.getElementById("driverAudit1").remove();
			document1.getElementById("carAudit1").remove();

			document1.getElementsByTag("title").get(0).text("Registered successfully");
			Element settle1_user = document1.getElementById("settle1_user");
			settle1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
			}
			@@ -593,10 +870,43 @@
			document1.getElementById("driverAudit2").remove();
			document1.getElementById("carAudit2").remove();

			document1.getElementsByTag("title").get(0).text("Enregistré avec succès");
			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());
			EmailUtil.send(driver.getEmail(), language == 1 ? "成功注册" : language == 2 ? "Registered successfully" : "Enregistré avec succès", document1.html());
			String randomString = ToolUtil.getRandomString(10);
			//开始生成pdf收据和html收据
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/home/igotechgh/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();

			String link ="https://igo.i-go.group/files/html/registration_" + randomString + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(driver.getId());
			tEmail.setType(2);
			tEmail.setName(language == 1 ? "成功注册" : language == 2 ? "Registered successfully" : "Enregistré avec succès");
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			String week = EmailUtil.getWeek(language, i);
			tEmail.setWeek(week);
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);
			}

			return ResultUtil.success();
			@@ -613,19 +923,19 @@
			*/
			@Override
			public ResultUtil resetPassword(String phone, String code, String password, Integer language) throws Exception {
			boolean b = this.checkCaptcha("", phone, code);
			if(!b){
			return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
			}
			// boolean b = this.checkCaptcha("", phone, code);
			// if(!b){
			// return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
			// }
			Driver driver = driverMapper.queryByPhone(phone);
			if(null == driver){
			return ResultUtil.error(language == 1 ? "电话号码未注册" : language == 2 ? "The phone number is not registered" : "Numéro de téléphone non enregistré");
			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 + "index.html";
			String path1 = templatePath + "driver/index.html";
			Document document1 = Jsoup.parse(new File(path1), "UTF-8");
			if(1 == language){
			document1.getElementById("english").remove();
			@@ -640,6 +950,7 @@
			document1.getElementById("driverAudit").remove();
			document1.getElementById("carAudit").remove();

			document1.getElementsByTag("title").get(0).text("密码重置");
			Element pass_user = document1.getElementById("pass_user");
			pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
			}
			@@ -656,6 +967,7 @@
			document1.getElementById("driverAudit1").remove();
			document1.getElementById("carAudit1").remove();

			document1.getElementsByTag("title").get(0).text("Reset password");
			Element pass1_user = document1.getElementById("pass1_user");
			pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
			}
			@@ -672,13 +984,45 @@
			document1.getElementById("driverAudit2").remove();
			document1.getElementById("carAudit2").remove();

			document1.getElementsByTag("title").get(0).text("Réinitialiser le mot de passe");
			Element pass2_user = document1.getElementById("pass2_user");
			pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
			}
			EmailUtil.send(driver.getEmail(), language == 1 ? "重置密码" : language == 2 ? "reset Password" : "réinitialiser le mot de passe", document1.html());
			EmailUtil.send(driver.getEmail(), language == 1 ? "密码重置" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document1.html());
			String randomString = ToolUtil.getRandomString(10);
			//开始生成pdf收据和html收据
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/home/igotechgh/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();

			String link ="https://igo.i-go.group/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?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);
			}

			smsrecordService.saveData(6, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
			return ResultUtil.success();
			}

			@@ -690,7 +1034,7 @@
			*/
			@Override
			public Map<String, Object> queryPhone(Double lat, Double lnt) throws Exception {
			ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lnt);
			ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lnt, null);
			if(null == reverseGeocode){
			System.err.println("获取地址异常");
			return null;
			@@ -723,16 +1067,16 @@
			public ResultUtil<LoginWarpper> driverLogin(String phone, String password, Integer language) throws Exception {
			Driver driver = driverMapper.queryByPhone(phone);
			if(null == driver){
			return ResultUtil.error(language == 1 ? "账号未注册" : language == 2 ? "Account not registered" : "Compte non enregistré");
			return ResultUtil.error(language == 1 ? "账号未注册" : language == 2 ? "Account unregistered" : "Compte non enregistré");
			}
			if(driver.getAuthState() == 1){
			return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
			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(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
			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(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
			return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
			}

			String value = redisUtil.getValue("DEVICE_" + driver.getId());
			@@ -755,6 +1099,38 @@
			loginWarpper.setJumpCode("200000");
			}
			}
			if(null != driver.getCarId()){
			Car car = carService.selectById(driver.getCarId());
			if(!StringUtils.hasLength(car.getVehicleId())){
			car.setVehicleId(UUIDUtil.getRandomCode());
			carService.updateById(car);
			}
			new Thread(()->{
			try {
			CarModel carModel = carModelMapper.selectById(car.getCarModelId());
			String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
			if(ToolUtil.isEmpty(vehicles)) {
			boolean createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!createVehicles){
			for (int i = 0; i < 5; i++) {
			createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(createVehicles){
			break;
			}
			try {
			Thread.sleep(5000L);
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}
			}
			}
			}
			}catch (Exception e){
			e.printStackTrace();
			}
			}).start();
			loginWarpper.setVehicleId(car.getVehicleId());
			}
			return ResultUtil.success(loginWarpper);
			}

			@@ -767,28 +1143,12 @@
			*/
			@Override
			public Map<String, Object> queryHomeData(Integer uid, Integer language) throws Exception {
			Driver driver = this.selectById(uid);
			driver.setLanguage(language);
			this.updateById(driver);
			Map<String, Object> map = driverMapper.queryHomeData(uid);
			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;
			}

			@@ -828,18 +1188,93 @@
			public ResultUtil work(Integer uid, String type, Integer language) throws Exception {
			DriverWork driverWork = driverWorkMapper.queryNewWork(uid, null, 1);
			Driver driver = this.selectById(uid);
			driver.setLanguage(language);
			Car car = carService.selectById(driver.getCarId());
			String audioUrl = "";
			LoginWarpper loginWarpper = new LoginWarpper();
			if(null != driverWork){//作下班操作
			//检测是否有未完成的订单
			List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid, language);
			if(list.size() > 0){
			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");
			return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "Outstanding orders ! So you can't get off work" : "Commandes en suspens ! Vous ne pouvez pas quitter le travail");
			}
			driverWork.setEndTime(new Date());
			driverWork.setState(2);
			driverWorkMapper.updateById(driverWork);
			driver.setState(1);

			if(!StringUtils.hasLength(car.getVehicleId())){
			car.setVehicleId(UUIDUtil.getRandomCode());
			carService.updateById(car);
			}

			//司机下班，修改谷歌上的车辆信息
			new Thread(()->{
			try {
			CarModel carModel = carModelMapper.selectById(car.getCarModelId());
			String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
			if(ToolUtil.isEmpty(vehicles)){
			boolean createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!createVehicles){
			for (int i = 0; i < 5; i++) {
			createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(createVehicles){
			break;
			}
			try {
			Thread.sleep(5000L);
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}
			}
			}

			boolean updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!updateVehicles){
			for (int i = 0; i < 5; i++) {
			updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(updateVehicles){
			break;
			}
			try {
			Thread.sleep(5000L);
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}
			}
			}
			}else{
			boolean updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!updateVehicles){
			for (int i = 0; i < 5; i++) {
			updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(updateVehicles){
			break;
			}
			try {
			Thread.sleep(5000L);
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}
			}
			}
			}
			}catch (Exception e){
			e.printStackTrace();
			}
			}).start();
			switch (language){
			case 1:
			audioUrl = "https://igo.i-go.group/files/audio/system/AfterWork-CN.mp3";
			break;
			case 2:
			audioUrl = "https://igo.i-go.group/files/audio/system/AfterWork-EN.mp3";
			break;
			case 3:
			audioUrl = "https://igo.i-go.group/files/audio/system/AfterWork-FR.mp3";
			break;
			}
			}else{
			LoginWarpper loginWarpper = new LoginWarpper();
			if(driver.getCompanyId()==null){
			loginWarpper.setJumpCode("100000");
			return ResultUtil.success(loginWarpper);
			@@ -851,21 +1286,21 @@
			}
			//判断是否存在审核中的资料
			if(driver.getAuthState()==1){
			return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data review, can't get out of the car" : "Données en cours de vérification, pas de voiture disponible");
			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(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
			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(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
			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(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data review, can't get out of the car" : "Données en cours de vérification, pas de voiture disponible");
			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(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
			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);
			driverWork.setDriverId(uid);
			@@ -873,9 +1308,87 @@
			driverWork.setType(type);
			driverWorkMapper.insert(driverWork);
			driver.setState(2);

			if(!StringUtils.hasLength(car.getVehicleId())){
			car.setVehicleId(UUIDUtil.getRandomCode());
			carService.updateById(car);
			}

			//司机上班，修改谷歌上的车辆信息
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			CarModel carModel = carModelMapper.selectById(car.getCarModelId());
			String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
			if(ToolUtil.isEmpty(vehicles)){
			boolean createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!createVehicles){
			for (int i = 0; i < 5; i++) {
			createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(createVehicles){
			break;
			}
			try {
			Thread.sleep(5000L);
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}
			}
			}

			boolean updateVehicles = fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!updateVehicles){
			for (int i = 0; i < 5; i++) {
			updateVehicles = fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(updateVehicles){
			break;
			}
			try {
			Thread.sleep(5000L);
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}
			}
			}
			}else{
			boolean updateVehicles = fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!updateVehicles){
			for (int i = 0; i < 5; i++) {
			updateVehicles = fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(updateVehicles){
			break;
			}
			try {
			Thread.sleep(5000L);
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}
			}
			}
			}
			}catch (Exception e){
			e.printStackTrace();
			}
			}
			}).start();

			switch (language){
			case 1:
			audioUrl = "https://igo.i-go.group/files/audio/system/AtWork-CN.mp3";
			break;
			case 2:
			audioUrl = "https://igo.i-go.group/files/audio/system/AtWork-EN.mp3";
			break;
			case 3:
			audioUrl = "https://igo.i-go.group/files/audio/system/AtWork-FR.mp3";
			break;
			}
			}
			this.updateById(driver);
			return ResultUtil.success();
			loginWarpper.setAudioUrl(audioUrl);
			loginWarpper.setVehicleId(car.getVehicleId());
			return ResultUtil.success(loginWarpper);
			}


			@@ -897,7 +1410,7 @@
			//检测是否有未完成的订单
			List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid, language);
			if(list.size() > 0){
			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");
			return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "Outstanding orders ! So you can't get off work" : "Commandes en suspens ! Vous ne pouvez pas quitter le travail");
			}
			driverWork.setEndTime(new Date());
			driverWork.setState(2);
			@@ -956,11 +1469,11 @@
			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, language);
			List<Map<String, Object>> list1 = orderLogisticsService.queryOrderList(1, uid, language);
			map.put("small", list1.size());//小件
			int size = this.queryMyActivity(uid, new Date(), language).size();
			map.put("activity", size);//活动
			@@ -976,14 +1489,14 @@
			*/
			@Override
			public List<BaseWarpper> queryMyBusiness(Integer uid, Integer language) throws Exception {
			List<DriverService> list = driverServiceMapper.queryMyBusiness(uid);
			List<Integer> list = Arrays.asList(1, 4);
			List<BaseWarpper> maps = new ArrayList<>();
			for (DriverService d : list){
			for (Integer d : list){
			BaseWarpper baseWarpper = new BaseWarpper();
			baseWarpper.setId(d.getType());
			switch (d.getType()){
			baseWarpper.setId(d);
			switch (d){
			case 1:
			baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course ");
			baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
			break;
			case 2:
			baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi");
			@@ -992,20 +1505,13 @@
			baseWarpper.setName(language == 1 ? "跨城出行" : language == 2 ? "Cross-town travel" : "Se déplacer à travers la ville");
			break;
			case 4:
			baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
			baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Delivery" : "Livraison");
			break;
			case 5:
			baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville");
			break;
			}
			maps.add(baseWarpper);
			}
			DriverOrders query = driverOrdersMapper.query(uid, 1);
			if(null == query){
			query = new DriverOrders();
			query.setDriverId(uid);
			query.setType(1);
			driverOrdersMapper.insert(query);
			}
			return maps;
			}
			@@ -1018,8 +1524,20 @@
			* @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);
			if(null != map.get("birthday")){
			String birthday = map.get("birthday").toString();
			map.put("birthday", DateUtil.conversionFormat(language, birthday));
			}
			if(null != map.get("networkCarlssueDate")){
			String networkCarlssueDate = map.get("networkCarlssueDate").toString();
			map.put("networkCarlssueDate", DateUtil.conversionFormat(language, networkCarlssueDate));
			}
			if(null != map.get("getDriverLicenseDate")){
			String getDriverLicenseDate = map.get("getDriverLicenseDate").toString();
			map.put("getDriverLicenseDate", DateUtil.conversionFormat(language, getDriverLicenseDate));
			}
			if(ToolUtil.isEmpty(map.get("qrCode"))){
			//获取小程序二维码
			Driver driver = new Driver();
			@@ -1027,7 +1545,6 @@
			driver.setQrCode(QrCodeUtil.getQrCode(uid));
			driverMapper.updateById(driver);
			}
			//减去本周的收入
			return map;
			}

			@@ -1044,19 +1561,17 @@
			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(language == 1 ? "电话号码已被注册" : language == 2 ? "he phone number is registered" : "Le numéro de téléphone a été enregistré");
			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);
			if(!b){
			return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
			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);

			smsrecordService.saveData(7, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
			return ResultUtil.success();
			}

			@@ -1092,7 +1607,7 @@
			driver.setPassword(ShiroKit.md5(password, salt));
			this.updateById(driver);
			if(ToolUtil.isNotEmpty(driver.getEmail())){
			String path1 = templatePath + "index.html";
			String path1 = templatePath + "driver/index.html";
			Document document1 = Jsoup.parse(new File(path1), "UTF-8");
			if(1 == language){
			document1.getElementById("english").remove();
			@@ -1107,6 +1622,7 @@
			document1.getElementById("driverAudit").remove();
			document1.getElementById("carAudit").remove();

			document1.getElementsByTag("title").get(0).text("密码重置");
			Element pass_user = document1.getElementById("pass_user");
			pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
			}
			@@ -1123,10 +1639,11 @@
			document1.getElementById("driverAudit1").remove();
			document1.getElementById("carAudit1").remove();

			document1.getElementsByTag("title").get(0).text("Reset password");
			Element pass1_user = document1.getElementById("pass1_user");
			pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
			}
			if(2 == language){
			if(3 == language){
			document1.getElementById("chinese").remove();
			document1.getElementById("english").remove();
			document1.getElementById("invite2").remove();
			@@ -1139,10 +1656,43 @@
			document1.getElementById("driverAudit2").remove();
			document1.getElementById("carAudit2").remove();

			document1.getElementsByTag("title").get(0).text("Réinitialiser le mot de passe");
			Element pass2_user = document1.getElementById("pass2_user");
			pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
			}
			EmailUtil.send(driver.getEmail(), language == 1 ? "重置密码" : language == 2 ? "reset Password" : "réinitialiser le mot de passe", document1.html());
			EmailUtil.send(driver.getEmail(), language == 1 ? "密码重置" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document1.html());
			String randomString = ToolUtil.getRandomString(10);
			//开始生成pdf收据和html收据
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/home/igotechgh/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();

			String link ="https://igo.i-go.group/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?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);
			}
			}

			@@ -1158,21 +1708,24 @@
			public ResultUtil replaceCar(Integer carId, Integer uid, Integer language) throws Exception {
			Driver driver = this.selectById(uid);
			if(driver.getState() == 3){
			return ResultUtil.error(language == 1 ? "还在服务中，不能更换" : language == 2 ? "It is still in service and cannot be replaced" : "Toujours en service, non échangeable");
			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 ? "The vehicle is under review" : "Véhicule en révision");
			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 frozen" : "Le véhicule a été gelé");
			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(language == 1 ? "车辆已被绑定了" : language == 2 ? "The vehicle has been bound" : "e véhicule a été lié");
			return ResultUtil.error(language == 1 ? "车辆已被绑定了" : language == 2 ? "Vehicle has been bound." : "Le véhicule a été connecté.");
			}
			driver.setCarId(carId);
			this.updateById(driver);
			@@ -1244,8 +1797,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;
			}

			@@ -1259,8 +1812,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, Arrays.asList(1), pageNum, size);
			return query;
			}

			@@ -1274,8 +1827,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, Arrays.asList(2, 3, 5, 6, 7), pageNum, size);
			return query;
			}

			@@ -1291,62 +1844,146 @@
			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 ? "邀请司机注册奖励GHS" + driverActivityRegistered.getMoney() :
			language == 2 ? " Invite drivers to register for a reward of GHS" + driverActivityRegistered.getMoney():
			"Invitez les chauffeurs à s’inscrire pour une récompense de GHS" + driverActivityRegistered.getMoney());
			break;
			case 2://邀请用户注册
			DriverActivityRegistered driverActivityRegistered1 = driverActivityRegisteredMapper.selectById(dah.getActivityId());
			activityWarpper.setId(driverActivityRegistered1.getId());
			activityWarpper.setContent("邀请用户注册奖励" + driverActivityRegistered1.getMoney() + "元");
			activityWarpper.setContent(language == 1 ? "邀请用户注册奖励GHS" + driverActivityRegistered1.getMoney() :
			language == 2 ? "Invite users to register for a reward of GHS" + driverActivityRegistered1.getMoney():
			"Invitez les utilisateurs à s’inscrire pour une récompense de GHS" + driverActivityRegistered1.getMoney());
			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, stay online receiving orders of " : "Aujourd’hui, reste en ligne à recevoir des commandes ");
			DriverOnline query = driverOnlineMapper.query(uid, sdf1.format(new Date()), driverActivityOnline.getType(), 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(language == 1 ? "打车" : language == 2 ? "Ride" : "Rouler");
			sb.append(language == 1 ? "打车" : language == 2 ? "ride" : "de course");
			break;
			case 2:
			sb.append("出租车");

			break;
			continue;
			case 3:
			sb.append("城际出行");
			break;
			continue;
			case 4:
			sb.append(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
			sb.append(language == 1 ? "包裹" : language == 2 ? "delivery" : "de livraison");
			break;
			}
			String str = "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元";
			String str = language == 1 ? "累计在线" +driverActivityOnline.getOnline() + "小时奖励GHS" +driverActivityOnline.getMoney():
			language == 2 ? " for " + driverActivityOnline.getOnline() + " hours to get a reward of GHS" + driverActivityOnline.getMoney():
			" pendant " + driverActivityOnline.getOnline() + " heures afin d'obtenir une récompense de GHS" + driverActivityOnline.getMoney();
			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() + "元");
			SimpleDateFormat sdf = new SimpleDateFormat("H:m");
			Date start = sdf.parse(driverActivityOrder.getStart());
			Date end = sdf.parse(driverActivityOrder.getEnd());
			activityWarpper.setContent(language == 1 ? "今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励GHS" + driverActivityOrder.getMoney():
			language == 2 ? "Today " + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + ", complete " + driverActivityOrder.getOrderNum() + " orders for a reward of GHS" + driverActivityOrder.getMoney() :
			"Aujourd’hui de " + driverActivityOrder.getStart() + " à " + driverActivityOrder.getEnd() + ", complétez " + driverActivityOrder.getOrderNum() + " commandes pour une récompense de GHS" + driverActivityOrder.getMoney());
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			Date start = sdf.parse(sdf1.format(time) + " " + driverActivityOrder.getStart() + ":00");
			Date end = sdf.parse(sdf1.format(time) + " " + driverActivityOrder.getEnd() + ":59");
			Integer integer = orderService.queryOrderNum(uid, start, end);
			activityWarpper.setCarryOut(integer > driverActivityOrder.getOrderNum() ? driverActivityOrder.getOrderNum() + "/" + driverActivityOrder.getOrderNum() : integer + "/" + driverActivityOrder.getOrderNum());
			activityWarpper.setCarryOut(integer.compareTo(driverActivityOrder.getOrderNum()) > 0 ? driverActivityOrder.getOrderNum() + "/" + driverActivityOrder.getOrderNum() : integer + "/" + driverActivityOrder.getOrderNum());
			break;
			}
			list.add(activityWarpper);
			}
			return list;
			}


			@Override
			public List<ActivityWarpper> queryHistoryList(Integer uid, Date time, Integer language) throws Exception {
			List<ActivityWarpper> list = new ArrayList<>();
			Map<String, Date> date = dateUtil.getStartAndEndDate(time);
			List<DriverActivityHistory> driverActivityHistories = driverActivityHistoryMapper.queryHistoryList(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(language == 1 ? "邀请司机注册奖励GHS" + driverActivityRegistered.getMoney() :
			language == 2 ? " Invite drivers to register for a reward of GHS" + driverActivityRegistered.getMoney():
			"Invitez les chauffeurs à s’inscrire pour une récompense de GHS" + driverActivityRegistered.getMoney());
			break;
			case 2://邀请用户注册
			DriverActivityRegistered driverActivityRegistered1 = driverActivityRegisteredMapper.selectById(dah.getActivityId());
			activityWarpper.setId(driverActivityRegistered1.getId());
			activityWarpper.setContent(language == 1 ? "邀请用户注册奖励GHS" + driverActivityRegistered1.getMoney() :
			language == 2 ? "Invite users to register for a reward of GHS" + driverActivityRegistered1.getMoney():
			"Invitez les utilisateurs à s’inscrire pour une récompense de GHS" + driverActivityRegistered1.getMoney());
			break;
			case 3://累计在线
			DriverActivityOnline driverActivityOnline = driverActivityOnlineMapper.selectById(dah.getActivityId());
			activityWarpper.setId(driverActivityOnline.getId());
			StringBuffer sb = new StringBuffer(language == 1 ? "今日" :
			language == 2 ? "Today, stay online receiving orders of " : "Aujourd’hui, reste en ligne à recevoir des commandes ");
			DriverOnline query = driverOnlineMapper.query(uid, sdf1.format(new Date()), driverActivityOnline.getType(), 0);
			Integer hour = 0;
			if(null != query){
			hour = Long.valueOf(query.getDuration() / 3600).intValue();
			}
			switch (driverActivityOnline.getType()){
			case 1:
			sb.append(language == 1 ? "打车" : language == 2 ? "ride" : "de course");
			break;
			case 2:
			sb.append("出租车");
			continue;
			case 3:
			sb.append("城际出行");
			continue;
			case 4:
			sb.append(language == 1 ? "包裹" : language == 2 ? "delivery" : "de livraison");
			break;
			}
			String str = language == 1 ? "累计在线" +driverActivityOnline.getOnline() + "小时奖励GHS" +driverActivityOnline.getMoney():
			language == 2 ? " for " + driverActivityOnline.getOnline() + " hours to get a reward of GHS" + driverActivityOnline.getMoney():
			" pendant " + driverActivityOnline.getOnline() + " heures afin d'obtenir une récompense de GHS" + driverActivityOnline.getMoney();
			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(language == 1 ? "今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励GHS" + driverActivityOrder.getMoney():
			language == 2 ? "Today " + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + ", complete " + driverActivityOrder.getOrderNum() + " orders for a reward of GHS" + driverActivityOrder.getMoney() :
			"Aujourd’hui de " + driverActivityOrder.getStart() + " à " + driverActivityOrder.getEnd() + ", complétez " + driverActivityOrder.getOrderNum() + " commandes pour une récompense de GHS" + driverActivityOrder.getMoney());
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			Date start = sdf.parse(sdf1.format(time) + " " + driverActivityOrder.getStart() + ":00");
			Date end = sdf.parse(sdf1.format(time) + " " + driverActivityOrder.getEnd() + ":59");
			Integer integer = orderService.queryOrderNum(uid, start, end);
			activityWarpper.setCarryOut(integer.compareTo(driverActivityOrder.getOrderNum()) > 0 ? driverActivityOrder.getOrderNum() + "/" + driverActivityOrder.getOrderNum() : integer + "/" + driverActivityOrder.getOrderNum());
			break;
			}
			list.add(activityWarpper);
			}
			return list;
			}



			/**
			@@ -1356,9 +1993,16 @@
			* @throws Exception
			*/
			@Override
			public List<Map<String, Object>> queryHistory(Integer uid, Integer pageNum, Integer size) throws Exception {
			public List<Map<String, Object>> queryHistory(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception {
			pageNum = (pageNum - 1) * size;
			return driverActivityHistoryMapper.query(uid, pageNum, size);
			List<Map<String, Object>> list = driverActivityHistoryMapper.query(uid, pageNum, size);
			for (Map<String, Object> map : list) {
			if(null != map.get("time")){
			String time = map.get("time").toString();
			map.put("time", DateUtil.conversionFormat(language, time));
			}
			}
			return list;
			}


			@@ -1379,6 +2023,7 @@
			for(Map<String, Object> map : query){
			for(Driver driver : drivers){
			DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
			driverActivityHistory.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
			driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
			driverActivityHistory.setType(1);
			driverActivityHistory.setDriverId(driver.getId());
			@@ -1389,69 +2034,115 @@
			driverActivityHistoryMapper.insert(driverActivityHistory);

			if(ToolUtil.isNotEmpty(driver.getEmail())) {
			String path1 = templatePath + "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("french").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());
			new Thread(() -> {
			try {
			String path1 = templatePath + "driver/index.html";
			Document document1 = null;
			try {
			document1 = Jsoup.parse(new File(path1), "UTF-8");
			} catch (IOException e) {
			throw new RuntimeException(e);
			}
			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();

			document1.getElementsByTag("title").get(0).text("邀请司机奖励（活动）");
			Element rewardToday_user = document1.getElementById("rewardToday_user");
			rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element rewardToday_award = document1.getElementById("rewardToday_award");
			rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
			Element rewardToday_content = document1.getElementById("rewardToday_content");
			rewardToday_content.html("邀请司机注册即可获得奖励。<br/>注意此活动是有时间限制的，详情请查看I-GO平台。");
			}
			if (2 == language) {
			document1.getElementById("chinese").remove();
			document1.getElementById("french").remove();
			document1.getElementById("invite1").remove();
			document1.getElementById("user1").remove();
			document1.getElementById("settle1").remove();
			document1.getElementById("pass1").remove();
			document1.getElementById("email1").remove();
			document1.getElementById("bill1").remove();
			document1.getElementById("reward1").remove();
			document1.getElementById("driverAudit1").remove();
			document1.getElementById("carAudit1").remove();

			document1.getElementsByTag("title").get(0).text("Invite drivers and earn");
			Element rewardToday1_user = document1.getElementById("rewardToday1_user");
			rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element rewardToday1_award = document1.getElementById("rewardToday1_award");
			rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
			Element rewardToday1_content = document1.getElementById("rewardToday1_content");
			rewardToday1_content.html("Invite drivers to register to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
			}
			if (3 == language) {
			document1.getElementById("chinese").remove();
			document1.getElementById("english").remove();
			document1.getElementById("invite2").remove();
			document1.getElementById("user2").remove();
			document1.getElementById("settle2").remove();
			document1.getElementById("pass2").remove();
			document1.getElementById("email2").remove();
			document1.getElementById("bill2").remove();
			document1.getElementById("reward2").remove();
			document1.getElementById("driverAudit2").remove();
			document1.getElementById("carAudit2").remove();

			document1.getElementsByTag("title").get(0).text("Invitez des chauffeurs et gagnez de l’argent");
			Element rewardToday2_user = document1.getElementById("rewardToday2_user");
			rewardToday2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element rewardToday2_award = document1.getElementById("rewardToday2_award");
			rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
			Element rewardToday2_content = document1.getElementById("rewardToday2_content");
			rewardToday2_content.html("Invitez les chauffeurs à s’inscrire pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
			}
			EmailUtil.send(driver.getEmail(), language == 1 ? "邀请司机奖励（活动）" : language == 2 ? "Invite drivers and earn" : "Invitez des chauffeurs et gagnez de l’argent", document1.html());
			String randomString = ToolUtil.getRandomString(10);
			//开始生成pdf收据和html收据
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/home/igotechgh/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();

			String link ="https://igo.i-go.group/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 ? "Invite drivers and earn" : "Invitez des chauffeurs et gagnez de l’argent");
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			String week = EmailUtil.getWeek(language, i);
			tEmail.setWeek(week);
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);
			}catch (Exception e){
			e.printStackTrace();
			}
			}).start();
			}
			}
			}
			@@ -1460,6 +2151,7 @@
			for(Map<String, Object> map : query){
			for(Driver driver : drivers){
			DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
			driverActivityHistory.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
			driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
			driverActivityHistory.setType(2);
			driverActivityHistory.setDriverId(driver.getId());
			@@ -1470,69 +2162,110 @@
			driverActivityHistoryMapper.insert(driverActivityHistory);

			if(ToolUtil.isNotEmpty(driver.getEmail())) {
			String path1 = templatePath + "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());
			new Thread(() -> {
			try {
			String path1 = templatePath + "driver/index.html";
			Document document1 = Jsoup.parse(new File(path1), "UTF-8");
			if (1 == language) {
			document1.getElementById("english").remove();
			document1.getElementById("french").remove();
			document1.getElementById("invite").remove();
			document1.getElementById("user").remove();
			document1.getElementById("settle").remove();
			document1.getElementById("pass").remove();
			document1.getElementById("email").remove();
			document1.getElementById("bill").remove();
			document1.getElementById("reward").remove();
			document1.getElementById("driverAudit").remove();
			document1.getElementById("carAudit").remove();

			document1.getElementsByTag("title").get(0).text("邀请用户奖励(活动)");
			Element rewardToday_user = document1.getElementById("rewardToday_user");
			rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element rewardToday_award = document1.getElementById("rewardToday_award");
			rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
			Element rewardToday_content = document1.getElementById("rewardToday_content");
			rewardToday_content.html("邀请用户注册即可获得奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
			}
			if (2 == language) {
			document1.getElementById("chinese").remove();
			document1.getElementById("french").remove();
			document1.getElementById("invite1").remove();
			document1.getElementById("user1").remove();
			document1.getElementById("settle1").remove();
			document1.getElementById("pass1").remove();
			document1.getElementById("email1").remove();
			document1.getElementById("bill1").remove();
			document1.getElementById("reward1").remove();
			document1.getElementById("driverAudit1").remove();
			document1.getElementById("carAudit1").remove();

			document1.getElementsByTag("title").get(0).text("Invite users and earn");
			Element rewardToday1_user = document1.getElementById("rewardToday1_user");
			rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element rewardToday1_award = document1.getElementById("rewardToday1_award");
			rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
			Element rewardToday1_content = document1.getElementById("rewardToday1_content");
			rewardToday1_content.html("Invite users to register to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
			}
			if (3 == language) {
			document1.getElementById("chinese").remove();
			document1.getElementById("english").remove();
			document1.getElementById("invite2").remove();
			document1.getElementById("user2").remove();
			document1.getElementById("settle2").remove();
			document1.getElementById("pass2").remove();
			document1.getElementById("email2").remove();
			document1.getElementById("bill2").remove();
			document1.getElementById("reward2").remove();
			document1.getElementById("driverAudit2").remove();
			document1.getElementById("carAudit2").remove();

			document1.getElementsByTag("title").get(0).text("Invitez des utilisateurs et gagnez de l’argent");
			Element rewardToday2_user = document1.getElementById("rewardToday2_user");
			rewardToday2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element rewardToday2_award = document1.getElementById("rewardToday2_award");
			rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
			Element rewardToday2_content = document1.getElementById("rewardToday2_content");
			rewardToday2_content.html("Invitez les utilisateurs à s’inscrire pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
			}
			EmailUtil.send(driver.getEmail(), language == 1 ? "邀请用户奖励(活动)" : language == 2 ? "Invite users and earn" : "Invitez des utilisateurs et gagnez de l’argent", document1.html());
			String randomString = ToolUtil.getRandomString(10);
			//开始生成pdf收据和html收据
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/home/igotechgh/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();

			String link ="https://igo.i-go.group/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 ? "Invite users and earn" : "Invitez des utilisateurs et gagnez de l’argent");
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			String week = EmailUtil.getWeek(language, i);
			tEmail.setWeek(week);
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);
			}catch (Exception e){
			e.printStackTrace();
			}
			}).start();
			}
			}
			}
			@@ -1542,6 +2275,7 @@
			DriverActivityOnline driverActivityOnline = driverActivityOnlineMapper.selectById(Integer.valueOf(String.valueOf(map.get("id"))));
			for(Driver driver : drivers){
			DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
			driverActivityHistory.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
			driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
			driverActivityHistory.setType(3);
			driverActivityHistory.setDriverId(driver.getId());
			@@ -1552,69 +2286,110 @@
			driverActivityHistoryMapper.insert(driverActivityHistory);

			if(ToolUtil.isNotEmpty(driver.getEmail())) {
			String path1 = templatePath + "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());
			new Thread(() -> {
			try {
			String path1 = templatePath + "driver/index.html";
			Document document1 = Jsoup.parse(new File(path1), "UTF-8");
			if (1 == language) {
			document1.getElementById("english").remove();
			document1.getElementById("french").remove();
			document1.getElementById("invite").remove();
			document1.getElementById("user").remove();
			document1.getElementById("settle").remove();
			document1.getElementById("pass").remove();
			document1.getElementById("email").remove();
			document1.getElementById("bill").remove();
			document1.getElementById("reward").remove();
			document1.getElementById("driverAudit").remove();
			document1.getElementById("carAudit").remove();

			document1.getElementsByTag("title").get(0).text("在线时长奖励（活动）");
			Element rewardToday_user = document1.getElementById("rewardToday_user");
			rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element rewardToday_award = document1.getElementById("rewardToday_award");
			rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
			Element rewardToday_content = document1.getElementById("rewardToday_content");
			rewardToday_content.html("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
			}
			if (2 == language) {
			document1.getElementById("chinese").remove();
			document1.getElementById("french").remove();
			document1.getElementById("invite1").remove();
			document1.getElementById("user1").remove();
			document1.getElementById("settle1").remove();
			document1.getElementById("pass1").remove();
			document1.getElementById("email1").remove();
			document1.getElementById("bill1").remove();
			document1.getElementById("reward1").remove();
			document1.getElementById("driverAudit1").remove();
			document1.getElementById("carAudit1").remove();

			document1.getElementsByTag("title").get(0).text("Online-duration reward activity");
			Element rewardToday1_user = document1.getElementById("rewardToday1_user");
			rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element rewardToday1_award = document1.getElementById("rewardToday1_award");
			rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
			Element rewardToday1_content = document1.getElementById("rewardToday1_content");
			rewardToday1_content.html("Stay online for " + driverActivityOnline.getOnline() + " hours to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
			}
			if (3 == language) {
			document1.getElementById("chinese").remove();
			document1.getElementById("english").remove();
			document1.getElementById("invite2").remove();
			document1.getElementById("user2").remove();
			document1.getElementById("settle2").remove();
			document1.getElementById("pass2").remove();
			document1.getElementById("email2").remove();
			document1.getElementById("bill2").remove();
			document1.getElementById("reward2").remove();
			document1.getElementById("driverAudit2").remove();
			document1.getElementById("carAudit2").remove();

			document1.getElementsByTag("title").get(0).text("Activité de récompense en ligne");
			Element rewardToday2_user = document1.getElementById("rewardToday2_user");
			rewardToday2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element rewardToday2_award = document1.getElementById("rewardToday2_award");
			rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
			Element rewardToday2_content = document1.getElementById("rewardToday2_content");
			rewardToday2_content.html("Restez en ligne pendant " + driverActivityOnline.getOnline() + " heures pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
			}
			EmailUtil.send(driver.getEmail(), language == 1 ? "在线时长奖励（活动）" : language == 2 ? "Online-duration reward activity" : "Activité de récompense en ligne", document1.html());
			String randomString = ToolUtil.getRandomString(10);
			//开始生成pdf收据和html收据
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/home/igotechgh/nginx/html/files/html/activity_" + randomString + ".html");
			if(!file.exists()){
			file.createNewFile();
			}
			FileWriter fileWriter = new FileWriter(file);
			fileWriter.write(document1.html());
			fileWriter.flush();
			fileWriter.close();

			String link ="https://igo.i-go.group/files/html/activity_" + randomString + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(driver.getId());
			tEmail.setType(2);
			tEmail.setName(language == 1 ? "在线时长奖励（活动）" : language == 2 ? "Online-duration reward activity" : "Activité de récompense en ligne");
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			String week = EmailUtil.getWeek(language, i);
			tEmail.setWeek(week);
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);
			}catch (Exception e){
			e.printStackTrace();
			}
			}).start();
			}
			}
			}
			@@ -1624,6 +2399,7 @@
			DriverActivityOrder driverActivityOrder = driverActivityOrderMapper.selectById(Integer.valueOf(String.valueOf(map.get("id"))));
			for(Driver driver : drivers){
			DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
			driverActivityHistory.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
			driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
			driverActivityHistory.setType(4);
			driverActivityHistory.setDriverId(driver.getId());
			@@ -1634,69 +2410,110 @@
			driverActivityHistoryMapper.insert(driverActivityHistory);

			if(ToolUtil.isNotEmpty(driver.getEmail())) {
			String path1 = templatePath + "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());
			new Thread(() -> {
			try {
			String path1 = templatePath + "driver/index.html";
			Document document1 = Jsoup.parse(new File(path1), "UTF-8");
			if (1 == language) {
			document1.getElementById("english").remove();
			document1.getElementById("french").remove();
			document1.getElementById("invite").remove();
			document1.getElementById("user").remove();
			document1.getElementById("settle").remove();
			document1.getElementById("pass").remove();
			document1.getElementById("email").remove();
			document1.getElementById("bill").remove();
			document1.getElementById("reward").remove();
			document1.getElementById("driverAudit").remove();
			document1.getElementById("carAudit").remove();

			document1.getElementsByTag("title").get(0).text("累计接单奖励（活动）");
			Element rewardToday_user = document1.getElementById("rewardToday_user");
			rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element rewardToday_award = document1.getElementById("rewardToday_award");
			rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
			Element rewardToday_content = document1.getElementById("rewardToday_content");
			rewardToday_content.html("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。<br/> 注意此活动是有时间限制的，详情请查看I-GO平台。");
			}
			if (2 == language) {
			document1.getElementById("chinese").remove();
			document1.getElementById("french").remove();
			document1.getElementById("invite1").remove();
			document1.getElementById("user1").remove();
			document1.getElementById("settle1").remove();
			document1.getElementById("pass1").remove();
			document1.getElementById("email1").remove();
			document1.getElementById("bill1").remove();
			document1.getElementById("reward1").remove();
			document1.getElementById("driverAudit1").remove();
			document1.getElementById("carAudit1").remove();

			document1.getElementsByTag("title").get(0).text("Cumulative order activity");
			Element rewardToday1_user = document1.getElementById("rewardToday1_user");
			rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element rewardToday1_award = document1.getElementById("rewardToday1_award");
			rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
			Element rewardToday1_content = document1.getElementById("rewardToday1_content");
			rewardToday1_content.html("Stay online and complete " + driverActivityOrder.getOrderNum() + " trips to get the bonus.<br/>Note that this is a limited-time offer. Check your app for more details.");
			}
			if (3 == language) {
			document1.getElementById("chinese").remove();
			document1.getElementById("english").remove();
			document1.getElementById("invite2").remove();
			document1.getElementById("user2").remove();
			document1.getElementById("settle2").remove();
			document1.getElementById("pass2").remove();
			document1.getElementById("email2").remove();
			document1.getElementById("bill2").remove();
			document1.getElementById("reward2").remove();
			document1.getElementById("driverAudit2").remove();
			document1.getElementById("carAudit2").remove();

			document1.getElementsByTag("title").get(0).text("Activité cumulée des commandes");
			Element rewardToday2_user = document1.getElementById("rewardToday2_user");
			rewardToday2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element rewardToday2_award = document1.getElementById("rewardToday2_award");
			rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
			Element rewardToday2_content = document1.getElementById("rewardToday2_content");
			rewardToday2_content.html("Restez en ligne et effectuez " + driverActivityOrder.getOrderNum() + " trajets pour obtenir le bonus.<br/>Notez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
			}
			EmailUtil.send(driver.getEmail(), language == 1 ? "累计接单奖励（活动）" : language == 2 ? "Cumulative order activity" : "Activité cumulée des commandes", document1.html());
			String randomString = ToolUtil.getRandomString(10);
			//开始生成pdf收据和html收据
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/home/igotechgh/nginx/html/files/html/activity_" + randomString + ".html");
			if(!file.exists()){
			file.createNewFile();
			}
			FileWriter fileWriter = new FileWriter(file);
			fileWriter.write(document1.html());
			fileWriter.flush();
			fileWriter.close();

			String link ="https://igo.i-go.group/files/html/activity_" + randomString + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(driver.getId());
			tEmail.setType(2);
			tEmail.setName(language == 1 ? "累计接单奖励（活动）" : language == 2 ? "Cumulative order activity" : "Activité cumulée des commandes");
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			String week = EmailUtil.getWeek(language, i);
			tEmail.setWeek(week);
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);
			}catch (Exception e){
			e.printStackTrace();
			}
			}).start();
			}
			}
			}
			@@ -1711,91 +2528,139 @@
			@Override
			public void taskMinute() throws Exception {
			Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
			Integer language = 1;
			//在线时长
			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());
			Long duration = Long.valueOf(dao.getOnline() * 60 * 60 * 1000);
			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);
			//修改余额
			Driver driver = this.selectById(dah.getDriverId());
			driver.setActivityMoney(new BigDecimal(null != driver.getActivityMoney() ? driver.getActivityMoney() : 0)
			.add(new BigDecimal(dah.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveActivityMoney(new BigDecimal(null != driver.getLaveActivityMoney() ? driver.getLaveActivityMoney() : 0)
			.add(new BigDecimal(dah.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0)
			.add(new BigDecimal(dah.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			this.updateById(driver);

			//添加收入记录
			incomeService.saveData(2, driverOnline.getDriverId(), 1, dao.getId(), null, dah.getMoney());


			if(ToolUtil.isNotEmpty(driver.getEmail())) {
			String path1 = templatePath + "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(null == dao){
			continue;
			}
			Long duration = Double.valueOf(dao.getOnline() * 3600).longValue();
			List<DriverOnline> driverOnlines = driverOnlineMapper.queryList(sdf.format(new Date()), null, dah.getDriverId(), duration);
			if(driverOnlines.size() > 0){
			dah.setCarryOut(2);//完成状态
			dah.setCompletionTime(new Date());
			driverActivityHistoryMapper.updateById(dah);

			redisUtil.remove("driverActivity_" + dah.getDriverId() + "_" + dah.getId());

			//修改余额
			Driver driver = this.selectById(dah.getDriverId());
			driver.setActivityMoney(new BigDecimal(null != driver.getActivityMoney() ? driver.getActivityMoney() : 0)
			.add(new BigDecimal(dah.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveActivityMoney(new BigDecimal(null != driver.getLaveActivityMoney() ? driver.getLaveActivityMoney() : 0)
			.add(new BigDecimal(dah.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0)
			.add(new BigDecimal(dah.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			this.updateById(driver);

			//添加收入记录
			incomeService.saveData(2, dah.getDriverId(), 1, dah.getId(), null, dah.getMoney());

			Integer language = driver.getLanguage();
			if(ToolUtil.isNotEmpty(driver.getEmail())) {
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			String path1 = templatePath + "driver/index.html";
			Document document1 = Jsoup.parse(new File(path1), "UTF-8");
			if (1 == language) {
			document1.getElementById("english").remove();
			document1.getElementById("french").remove();
			document1.getElementById("invite").remove();
			document1.getElementById("user").remove();
			document1.getElementById("settle").remove();
			document1.getElementById("pass").remove();
			document1.getElementById("email").remove();
			document1.getElementById("bill").remove();
			document1.getElementById("rewardToday").remove();
			document1.getElementById("driverAudit").remove();
			document1.getElementById("carAudit").remove();

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

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

			document1.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
			Element reward2_user = document1.getElementById("reward2_user");
			reward2_user.text("Cher(ère) " + driver.getFirstName() + "" + driver.getLastName() + "，");
			Element reward2_content = document1.getElementById("reward2_content");
			reward2_content.html("Vous êtes resté en ligne pendant " + dao.getOnline() + " heures aujourd’hui et avez obtenu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.<br/>Consultez votre application pour plus de détails.");
			}
			EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
			String randomString = ToolUtil.getRandomString(10);
			//开始生成pdf收据和html收据
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/home/igotechgh/nginx/html/files/html/rewards_" + randomString + ".html");
			if(!file.exists()){
			file.createNewFile();
			}
			FileWriter fileWriter = new FileWriter(file);
			fileWriter.write(document1.html());
			fileWriter.flush();
			fileWriter.close();

			String link ="https://igo.i-go.group/files/html/rewards_" + randomString + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(driver.getId());
			tEmail.setType(2);
			tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			String week = EmailUtil.getWeek(language, i);
			tEmail.setWeek(week);
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);
			}catch (Exception e){
			e.printStackTrace();
			}
			}
			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());
			}
			}).start();
			}
			}
			}
			@@ -1807,6 +2672,7 @@
			Integer integer = orderService.queryOrderNum(dah.getDriverId(), date.get("startTime"), date.get("endTime"));
			if(dao.getOrderNum() <= integer){
			dah.setCarryOut(2);//完成状态
			dah.setCompletionTime(new Date());
			driverActivityHistoryMapper.updateById(dah);
			//修改余额
			Driver driver = this.selectById(dah.getDriverId());
			@@ -1819,66 +2685,112 @@
			this.updateById(driver);

			//添加收入记录
			incomeService.saveData(2, dah.getDriverId(), 1, dao.getId(), null, dah.getMoney());

			incomeService.saveData(2, dah.getDriverId(), 1, dah.getId(), null, dah.getMoney());

			Integer language = driver.getLanguage();
			if(ToolUtil.isNotEmpty(driver.getEmail())) {
			String path1 = templatePath + "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());
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			String path1 = templatePath + "driver/index.html";
			Document document1 = Jsoup.parse(new File(path1), "UTF-8");
			if (1 == language) {
			document1.getElementById("english").remove();
			document1.getElementById("french").remove();
			document1.getElementById("invite").remove();
			document1.getElementById("user").remove();
			document1.getElementById("settle").remove();
			document1.getElementById("pass").remove();
			document1.getElementById("email").remove();
			document1.getElementById("bill").remove();
			document1.getElementById("rewardToday").remove();
			document1.getElementById("driverAudit").remove();
			document1.getElementById("carAudit").remove();

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

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

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

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

			String link ="https://igo.i-go.group/files/html/rewards_" + randomString + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(driver.getId());
			tEmail.setType(2);
			tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			String week = EmailUtil.getWeek(language, i);
			tEmail.setWeek(week);
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);
			}catch (Exception e){
			e.printStackTrace();
			}
			}
			}).start();
			}
			}
			}
			@@ -1893,13 +2805,13 @@
			public ResultUtil loginByJobNumber(String jobNum, Integer language) {
			Driver driver = driverMapper.queryByJobNum(jobNum);
			if(null == driver){
			return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
			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(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
			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(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
			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;
			@@ -1910,7 +2822,7 @@
			}
			}
			if(b){
			return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
			return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
			}

			//开始自动设置接单类型，出车类型，上班状态
			@@ -1991,13 +2903,13 @@
			public ResultUtil loginByIdentification(String identification, Integer language) throws Exception {
			Driver driver = driverMapper.queryByIdentification(identification);
			if(null == driver){
			return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
			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(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
			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(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
			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;
			@@ -2008,7 +2920,7 @@
			}
			}
			if(b){
			return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
			return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
			}

			//开始自动设置接单类型，出车类型，上班状态
			@@ -2077,13 +2989,13 @@
			public ResultUtil loginByTaxiAptitudeCard(String taxiAptitudeCard, Integer language) throws Exception {
			Driver driver = driverMapper.queryByTaxiAptitudeCard(taxiAptitudeCard);
			if(null == driver){
			return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
			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(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
			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(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
			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;
			@@ -2094,7 +3006,7 @@
			}
			}
			if(b){
			return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
			return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
			}

			//开始自动设置接单类型，出车类型，上班状态
			@@ -2183,10 +3095,10 @@
			public ResultUtil verificationPassword(String password, Integer driverId, Integer language) throws Exception {
			Driver driver = this.selectById(driverId);
			if(null == driver){
			return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
			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(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
			return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
			}
			return ResultUtil.success();
			}
			@@ -2202,7 +3114,7 @@
			public ResultUtil setWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception {
			Driver driver = this.selectById(driverId);
			if(null == driver){
			return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
			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);
			@@ -2221,13 +3133,13 @@
			public ResultUtil verificationWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception {
			Driver driver = this.selectById(driverId);
			if(null == driver){
			return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
			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(language == 1 ? "请先设置提现密码" : language == 2 ? "Please set the withdrawal password first" : "Veuillez d’abord définir un mot de passe de retrait");
			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(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
			return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
			}
			return ResultUtil.success();
			}
			@@ -2263,14 +3175,28 @@
			* @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) {
			if(null != map.get("insertTime")){
			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) {
			if(null != map.get("insertTime")){
			String insertTime = map.get("insertTime").toString();
			map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
			}
			}
			return list;
			}
			return null;

			@@ -2333,6 +3259,7 @@
			redisUtil.remove("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存
			redisUtil.remove("DRIVER_" + id);//清除存储的token
			}

			}

			@Override
			@@ -2344,4 +3271,37 @@
			public Double getThisWeekMoney(Integer driverId) {
			return this.baseMapper.getThisWeekMoney(driverId);
			}


			/**
			* 获取给定车型且空闲的司机
			* @param type
			* @param serverCarModelId
			* @param lon
			* @param lat
			* @param distance
			* @param companyId
			* @return
			* @throws Exception
			*/
			@Override
			public List<Driver> queryIdleDriver(Integer userId, Integer type, Integer serverCarModelId, Double lon, Double lat, Double distance, Integer companyId) throws Exception {
			List<Driver> drivers = driverMapper.queryIdleDriver_(type, serverCarModelId, companyId);
			System.err.println("派单查询的司机：" + JSON.toJSONString(drivers));
			String tripId = redisUtil.getValue("trip" + userId);
			List<Driver> list = new ArrayList<>();
			for(Driver driver : drivers){
			String value = redisUtil.getValue("DRIVER" + driver.getId());
			if(ToolUtil.isNotEmpty(value)){
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(lat, lon, Double.parseDouble(value.split(",")[1]), Double.parseDouble(value.split(",")[0]), tripId);
			if(null != distancematrix){
			if(distancematrix.getDistance() < (distance * 1000)){
			list.add(driver);
			}
			}

			}
			}
			return list;
			}
			}