From 9317fed1cea5372d9997a8273c07f041db94f99c Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 28 五月 2024 09:40:11 +0800
Subject: [PATCH] 新增功能
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 1733 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 1,519 insertions(+), 214 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index f948b13..a28d5db 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -18,8 +18,10 @@
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.FleetEngineUtil;
import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
import com.stylefeng.guns.modular.system.util.GoogleMap.ReverseGeocodeVo;
+import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import org.apache.shiro.authc.SimpleAuthenticationInfo;
@@ -27,12 +29,19 @@
import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
import org.apache.shiro.crypto.hash.Md5Hash;
import org.apache.shiro.util.ByteSource;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -116,9 +125,6 @@
@Autowired
private IOrderTaxiService orderTaxiService;
- @Autowired
- private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
@Resource
private CarServiceMapper carServiceMapper;
@@ -134,10 +140,27 @@
@Autowired
private IOrderLogisticsService orderLogisticsService;
- @Value("${pushMinistryOfTransport}")
- private boolean pushMinistryOfTransport;
+ @Resource
+ private DriverOnlineMapper driverOnlineMapper;
+
+ @Value("${spring.mail.template-path}")
+ private String templatePath;
private String salt = "SA;d5#";
+
+ @Autowired
+ private SMSUtil smsUtil;
+
+
+ @Autowired
+ private TEmailService emailService;
+
+ @Autowired
+ private FleetEngineUtil fleetEngineUtil;
+
+
+ @Resource
+ private CarModelMapper carModelMapper;
@Override
@@ -157,56 +180,122 @@
* @throws Exception
*/
@Override
- public ResultUtil queryCaptcha(String phone, Integer type) throws Exception {
+ public ResultUtil queryCaptcha(String phone, Integer type, Integer language) throws Exception {
+ if(type == 3){
+ Driver driver1 = driverMapper.queryByPhone(phone);
+ if(null != driver1){
+ if(driver1.getAuthState() == 1){
+ return ResultUtil.error(language == 1 ? "该司机正在审核中" : language == 2 ? "The driver is being reviewed." : "Le chauffeur est en cours d’examen.");
+ }
+ if(driver1.getAuthState() == 2){
+ return ResultUtil.error(language == 1 ? "该司机已存在" : language == 2 ? "The driver is already existent." : "Le chauffeur existe déjà.");
+ }
+ if(driver1.getAuthState() == 3){
+ return ResultUtil.error(language == 1 ? "该司机账号已被冻结" : language == 2 ? "Driver account is frozen." : "Le compte du chauffeur est gelé.");
+ }
+ }
+ }
+
Random random = new Random();
StringBuffer sb = new StringBuffer();
for(int i = 0; i < 4; i++){
sb.append((int) (random.nextDouble() * 10));
}
String authCode = sb.toString();
- String sms = "短信验证码【" + authCode + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!";
+ String sms = "";
//发送验证码短信
redisUtil.setStrValue(phone, authCode, 5 * 60);//设置五分钟过期
- String templateCode = "";
- switch (type){
+ switch (language){
case 1:
- templateCode = "SMS_207770039";//身份验证
+ sms = "您的验证码为：" + authCode + "，该验证码5分钟内有效，请勿泄漏于他人！";
break;
case 2:
- templateCode = "SMS_207770039";//登录确认
+ sms = "Your verification code is " + authCode + "，it is valid within 5 minutes, please do not reveal it to others.";
break;
case 3:
- templateCode = "SMS_207770039";//用户注册
- break;
- case 4:
- templateCode = "SMS_207770039";//修改密码
+ 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;
}
- String sData = aLiSendSms.sendSms(phone, templateCode, "{\"code\":\"" + authCode + "\"}");
- JSONObject jsonObject = JSON.parseObject(sData);
- String message = jsonObject.getString("Message");
- if(!"OK".equals(message)){
- return ResultUtil.error("");
- }
+ smsUtil.sendCellulantMessage(phone, sms);
+ smsrecordService.saveData(type, phone, authCode, sms);
System.out.println(sms);
return ResultUtil.success();
}
@Override
- public ResultUtil queryEmailCaptcha(String email) throws Exception {
+ public ResultUtil queryEmailCaptcha(String email, Integer language) throws Exception {
Random random = new Random();
StringBuffer sb = new StringBuffer();
for(int i = 0; i < 4; i++){
sb.append((int) (random.nextDouble() * 10));
}
String authCode = sb.toString();
- String sms = "您发送的验证码为【" + authCode + "】，验证码将在5分钟后失效!";
//发送验证码短信
redisUtil.setStrValue(email, authCode, 5 * 60);//设置五分钟过期
- EmailUtil.getMimeMessage(email, "验证码", sms);
+
+ String path = templatePath + "driver/index.html";
+ Document document = Jsoup.parse(new File(path), "UTF-8");
+ if(1 == language){
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
+ document.getElementById("invite").remove();
+ document.getElementById("user").remove();
+ document.getElementById("settle").remove();
+ document.getElementById("pass").remove();
+ document.getElementById("bill").remove();
+ document.getElementById("reward").remove();
+ document.getElementById("rewardToday").remove();
+ document.getElementById("driverAudit").remove();
+ document.getElementById("carAudit").remove();
+
+ 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分钟内完成验证");
+ }
+ if(2 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
+ document.getElementById("invite1").remove();
+ document.getElementById("user1").remove();
+ document.getElementById("settle1").remove();
+ document.getElementById("pass1").remove();
+ document.getElementById("bill1").remove();
+ document.getElementById("reward1").remove();
+ document.getElementById("rewardToday1").remove();
+ document.getElementById("driverAudit1").remove();
+ document.getElementById("carAudit1").remove();
+
+ 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("Your delivery pickup code is " + authCode + ", please complete the verification within 5 minutes");
+ }
+ if(3 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
+ document.getElementById("invite2").remove();
+ document.getElementById("user2").remove();
+ document.getElementById("settle2").remove();
+ document.getElementById("pass2").remove();
+ document.getElementById("bill2").remove();
+ document.getElementById("reward2").remove();
+ document.getElementById("rewardToday2").remove();
+ document.getElementById("driverAudit2").remove();
+ document.getElementById("carAudit2").remove();
+
+ 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("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 validation", document.html());
return ResultUtil.success();
}
@@ -218,12 +307,12 @@
* @throws Exception
*/
@Override
- public boolean checkCaptcha(String phone, String code) throws Exception {
- Object value = redisUtil.getValue(phone);
+ public boolean checkCaptcha(String email, String phone, String code) throws Exception {
+ Object value = redisUtil.getValue(ToolUtil.isNotEmpty(email) ? email : phone);
+ redisUtil.remove(ToolUtil.isNotEmpty(email) ? email : phone);
if("1246".equals(code)){
return true;
}
-
if(null != value && code.equals(String.valueOf(value))){
return true;
}else{
@@ -237,23 +326,127 @@
* @throws Exception
*/
@Override
- public ResultUtil registeredDriver(String phone, String code, String password, Integer uid, Integer type, Integer userType) throws Exception {
- ResultUtil<LoginWarpper> result = this.registeredDriver(phone, code, password,uid,type);
- if(result.getCode() == 200 && null != uid){
- /*if(type == 2){
+ 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(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());
BigDecimal bigDecimal = new BigDecimal("0");
for(Map<String, Object> map : query){
+ DriverActivityHistory dah = new DriverActivityHistory();
+ dah.setActivityId(Integer.valueOf(map.get("id").toString()));
+ dah.setDriverId(uid);
+ dah.setType(1);
+ DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectOne(dah);
+ driverActivityHistory.setCarryOut(2);
+ driverActivityHistoryMapper.updateById(driverActivityHistory);
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"))));
+ incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, Double.valueOf(String.valueOf(map.get("money"))));
}
}
driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driverMapper.updateById(driver);
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())){
+ String path = templatePath + "driver/index.html";
+ Document document = Jsoup.parse(new File(path), "UTF-8");
+ if(1 == language){
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
+ document.getElementById("user").remove();
+ document.getElementById("settle").remove();
+ document.getElementById("pass").remove();
+ document.getElementById("email").remove();
+ document.getElementById("bill").remove();
+ document.getElementById("reward").remove();
+ document.getElementById("rewardToday").remove();
+ document.getElementById("driverAudit").remove();
+ document.getElementById("carAudit").remove();
+
+ document.getElementsByTag("title").get(0).text("司机奖励通知");
+ Element invite_user = document.getElementById("invite_user");
+ invite_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ Element invite_content = document.getElementById("invite_content");
+ invite_content.text("您已成功邀请一位司机注册I-GO，获得奖励GHS " + bigDecimal.doubleValue() + "，请查收");
+ }
+ if(2 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
+ document.getElementById("user1").remove();
+ document.getElementById("settle1").remove();
+ document.getElementById("pass1").remove();
+ document.getElementById("email1").remove();
+ document.getElementById("bill1").remove();
+ document.getElementById("reward1").remove();
+ document.getElementById("rewardToday1").remove();
+ document.getElementById("driverAudit1").remove();
+ document.getElementById("carAudit1").remove();
+
+ document.getElementsByTag("title").get(0).text("Reward-driver notice");
+ Element invite1_user = document.getElementById("invite1_user");
+ invite1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ Element invite1_content = document.getElementById("invite1_content");
+ invite1_content.text("You have succeeded to invite a driver to register with I-GO, so you received a GHS " + bigDecimal.doubleValue() + " bonus, please check your balance.");
+ }
+ if(3 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
+ document.getElementById("user2").remove();
+ document.getElementById("settle2").remove();
+ document.getElementById("pass2").remove();
+ document.getElementById("email2").remove();
+ document.getElementById("bill2").remove();
+ document.getElementById("reward2").remove();
+ document.getElementById("rewardToday2").remove();
+ document.getElementById("driverAudit2").remove();
+ document.getElementById("carAudit2").remove();
+
+ document.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
+ Element invite2_user = document.getElementById("invite2_user");
+ invite2_user.text("Bonjour " + driver.getFirstName() + " " + driver.getLastName() + "，");
+ Element invite2_content = document.getElementById("invite2_content");
+ invite2_content.text("Vous avez invité avec succès un conducteur à s’inscrire à i-go pour recevoir une récompense GHS " + bigDecimal.doubleValue() + ". Veuillez vérifier");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document.html());
+ String randomString = ToolUtil.getRandomString(10);
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/usr/local/nginx/html/files/html/invitation_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(driver.getId());
+ tEmail.setType(2);
+ tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ String week = EmailUtil.getWeek(language, i);
+ tEmail.setWeek(week);
+ boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+ if(am){
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
+ }
+ emailService.insert(tEmail);
+ }
+
}
if(type == 1){//用户分享
UserInfo userInfo = userInfoMapper.selectById(uid);
@@ -280,9 +473,204 @@
userCouponRecordMapper.insert(userCouponRecord);
}
}
- }*/
+ }
}
return result;
+ }
+
+
+
+
+
+
+
+
+ /**
+ * 司机提交注册申请
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil registeredDriver1(String phoneOperator, String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language) throws Exception {
+ boolean b = this.checkCaptcha("", phone, code);
+ if(!b){
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
+ }
+ Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据
+ if(null != driver1){
+ driver1.setAuthState(1);
+ driverMapper.updateById(driver1);
+ return ResultUtil.success();
+ }
+
+ driver1 = driverMapper.queryByPhone(phone);
+ if(null != driver1){
+ return ResultUtil.error(language == 1 ? "手机号已被注册" : language == 2 ? "The mobile phone number has been registered" : "Le numéro de téléphone portable a été enregistré");
+ }
+ Driver driver = new Driver();
+ driver.setAccount(phone);
+ driver.setJobNumber(getCode());
+ driver.setPhoneOperator(phoneOperator);
+ driver.setPhone(phone);
+ driver.setPassword(ShiroKit.md5(password, salt));
+ driver.setAuthState(1);
+ driver.setState(1);
+ driver.setInsertTime(new Date());
+ driver.setAddType(1);
+ driver.setBalance(0D);
+ if(null!=uid){
+ driver.setUid(uid);
+ }
+ if(null!=type){
+ driver.setuType(type);
+ }
+ this.insert(driver);
+ if(null != uid){
+ if(type == 2){
+ driver = driverMapper.selectById(uid);
+ List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
+ BigDecimal bigDecimal = new BigDecimal("0");
+ for(Map<String, Object> map : query){
+ DriverActivityHistory dah = new DriverActivityHistory();
+ dah.setActivityId(Integer.valueOf(map.get("id").toString()));
+ dah.setDriverId(uid);
+ dah.setType(1);
+ DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectOne(dah);
+ driverActivityHistory.setCarryOut(2);
+ driverActivityHistoryMapper.updateById(driverActivityHistory);
+ 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, driverActivityHistory.getId(), null, Double.valueOf(String.valueOf(map.get("money"))));
+ }
+ }
+ driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ driverMapper.updateById(driver);
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())){
+ String path = templatePath + "driver/index.html";
+ Document document = Jsoup.parse(new File(path), "UTF-8");
+ if(1 == language){
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
+ document.getElementById("user").remove();
+ document.getElementById("settle").remove();
+ document.getElementById("pass").remove();
+ document.getElementById("email").remove();
+ document.getElementById("bill").remove();
+ document.getElementById("reward").remove();
+ document.getElementById("rewardToday").remove();
+ document.getElementById("driverAudit").remove();
+ document.getElementById("carAudit").remove();
+
+ document.getElementsByTag("title").get(0).text("司机奖励通知");
+ Element invite_user = document.getElementById("invite_user");
+ invite_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ Element invite_content = document.getElementById("invite_content");
+ invite_content.text("您已成功邀请一位司机注册I-GO，获得奖励GHS " + bigDecimal.doubleValue() + "，请查收");
+ }
+ if(2 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
+ document.getElementById("user1").remove();
+ document.getElementById("settle1").remove();
+ document.getElementById("pass1").remove();
+ document.getElementById("email1").remove();
+ document.getElementById("bill1").remove();
+ document.getElementById("reward1").remove();
+ document.getElementById("rewardToday1").remove();
+ document.getElementById("driverAudit1").remove();
+ document.getElementById("carAudit1").remove();
+
+ document.getElementsByTag("title").get(0).text("Reward-driver notice");
+ Element invite1_user = document.getElementById("invite1_user");
+ invite1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ Element invite1_content = document.getElementById("invite1_content");
+ invite1_content.text("You have succeeded to invite a driver to register with I-GO, so you received a GHS " + bigDecimal.doubleValue() + " bonus, please check your balance.");
+ }
+ if(3 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
+ document.getElementById("user2").remove();
+ document.getElementById("settle2").remove();
+ document.getElementById("pass2").remove();
+ document.getElementById("email2").remove();
+ document.getElementById("bill2").remove();
+ document.getElementById("reward2").remove();
+ document.getElementById("rewardToday2").remove();
+ document.getElementById("driverAudit2").remove();
+ document.getElementById("carAudit2").remove();
+
+ document.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
+ Element invite2_user = document.getElementById("invite2_user");
+ invite2_user.text("Bonjour " + driver.getFirstName() + " " + driver.getLastName() + "，");
+ Element invite2_content = document.getElementById("invite2_content");
+ invite2_content.text("Vous avez invité avec succès un conducteur à s’inscrire à i-go pour recevoir une récompense GHS " + bigDecimal.doubleValue() + ". Veuillez vérifier");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document.html());
+ String randomString = ToolUtil.getRandomString(10);
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/usr/local/nginx/html/files/html/invitation_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(driver.getId());
+ tEmail.setType(2);
+ tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ String week = EmailUtil.getWeek(language, i);
+ tEmail.setWeek(week);
+ boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+ if(am){
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
+ }
+ emailService.insert(tEmail);
+ }
+
+ }
+ if(type == 1){//用户分享
+ UserInfo userInfo = userInfoMapper.selectById(uid);
+ List<Map<String, Object>> query = userActivityInviteMapper.query(userInfo.getCompanyId());
+ Date date = new Date();
+ for(Map<String, Object> map : query){
+ for(int i = Integer.valueOf(String.valueOf(map.get("totalNum"))); i > 0; i--){
+ UserCouponRecord userCouponRecord = new UserCouponRecord();
+ userCouponRecord.setActivityType(3);
+ userCouponRecord.setCouponActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
+ userCouponRecord.setCouponId(Integer.valueOf(String.valueOf(map.get("couponId"))));
+ userCouponRecord.setState(1);
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + Integer.valueOf(String.valueOf(map.get("effective"))));
+ userCouponRecord.setExpirationTime(calendar.getTime());
+ userCouponRecord.setCouponType(Integer.valueOf(String.valueOf(map.get("couponType"))));
+ userCouponRecord.setCouponUseType(Integer.valueOf(String.valueOf(map.get("couponUseType"))));
+ userCouponRecord.setInsertTime(date);
+ userCouponRecord.setFullMoney(Double.valueOf(String.valueOf(map.get("fullMoney"))));
+ userCouponRecord.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
+ userCouponRecord.setCompanyId(userInfo.getCompanyId());
+ userCouponRecord.setUserId(uid);
+ userCouponRecordMapper.insert(userCouponRecord);
+ }
+ }
+ }
+ }
+ return ResultUtil.success();
}
@@ -297,10 +685,10 @@
* @throws Exception
*/
@Override
- public ResultUtil<LoginWarpper> registeredDriver(String phone, String code, String password,Integer uid,Integer uType) throws Exception {
- boolean b = this.checkCaptcha(phone, code);
+ public ResultUtil<LoginWarpper> registeredDriver(String phoneOperator, String phone, String code, String password,Integer uid,Integer uType, Integer language) throws Exception {
+ boolean b = this.checkCaptcha("", phone, code);
if(!b){
- return ResultUtil.error("验证码无效");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}
Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据
@@ -309,19 +697,19 @@
driverMapper.updateById(driver1);
LoginWarpper loginWarpper = new LoginWarpper();
loginWarpper.setId(driver1.getId());
- return ResultUtil.error("电话号码已使用", loginWarpper);
+ return ResultUtil.success(loginWarpper);
}
-
driver1 = driverMapper.queryByPhone(phone);
if(null != driver1){
LoginWarpper loginWarpper = new LoginWarpper();
loginWarpper.setId(driver1.getId());
- return ResultUtil.error("电话号码已使用", loginWarpper);
+ return ResultUtil.success(loginWarpper);
}
Driver driver = new Driver();
driver.setAccount(phone);
driver.setJobNumber(getCode());
+ driver.setPhoneOperator(phoneOperator);
driver.setPhone(phone);
driver.setPassword(ShiroKit.md5(password, salt));
driver.setAuthState(1);
@@ -362,17 +750,19 @@
* @throws Exception
*/
@Override
- public ResultUtil updateDriver(RegisteredWarpper registeredWarpper, Integer uid) throws Exception {
+ public ResultUtil updateDriver(RegisteredWarpper registeredWarpper, Integer uid, Integer language) throws Exception {
Driver driver = this.selectById(uid);
- driver.setName(registeredWarpper.getName());
+ driver.setLastName(registeredWarpper.getLastName());
+ driver.setFirstName(registeredWarpper.getFirstName());
driver.setSex(registeredWarpper.getSex());
driver.setIdCard(registeredWarpper.getIdCard());
+ driver.setBirthday(registeredWarpper.getBirthday());
City city1 = cityService.selectById(registeredWarpper.getPlaceOfPracticeId());
String[] city = new String[]{city1.getEnglishName()};
Company query = companyCityService.query(city);
if(null == query){
- return ResultUtil.error("选择从业地暂未开通业务");
+ return ResultUtil.error(language == 1 ? "选择从业地暂未开通业务" : language == 2 ? "Not yet to commence business at the workplace selected." : "N’a pas encore commencé ses activités sur le lieu de travail sélectionné.");
}
if(null != query){
switch (query.getType()){
@@ -391,20 +781,21 @@
driver.setHeadImgUrl(registeredWarpper.getHeadImgUrl());
driver.setIdCardImgUrl1(registeredWarpper.getIdCardImgUrl1());
driver.setIdCardImgUrl2(registeredWarpper.getIdCardImgUrl2());
- driver.setPlaceOfEmployment(city1.getEnglishName());
+ driver.setPlaceOfEmployment(language == 1 ? city1.getChineseName() : language == 2 ? city1.getEnglishName() : city1.getFrenchName());
driver.setDriverAddress(registeredWarpper.getDriverContactAddress());
driver.setDriverContactAddress(registeredWarpper.getDriverContactAddress());
driver.setDriverContactAddress_(registeredWarpper.getDriverContactAddress_());
- driver.setPlaceOfPractice(city1.getEnglishName());
+ driver.setPlaceOfPractice(language == 1 ? city1.getChineseName() : language == 2 ? city1.getEnglishName() : city1.getFrenchName());
Calendar calendar = Calendar.getInstance();
- calendar.setTime(registeredWarpper.getGetDriverLicenseDate());
+// calendar.setTime(registeredWarpper.getGetDriverLicenseDate());
Calendar now = Calendar.getInstance();
now.setTime(new Date());
driver.setDriverAge(now.get(Calendar.YEAR) - calendar.get(Calendar.YEAR));
- driver.setGetDriverLicenseDate(registeredWarpper.getGetDriverLicenseDate());
- driver.setDriveCardImgUrl1(registeredWarpper.getDriveCardImgUrl1());
+// driver.setGetDriverLicenseDate(registeredWarpper.getGetDriverLicenseDate());
+ driver.setDriveCardImgUrl1(registeredWarpper.getDriveCardImgUrl());
driver.setDriveCardImgUrl2(registeredWarpper.getDriveCardImgUrl2());
+ driver.setDriveCard(registeredWarpper.getDriveCard());
driver.setEmail(registeredWarpper.getEmail());
this.updateById(driver);
@@ -429,6 +820,95 @@
}
}
+ if(ToolUtil.isNotEmpty(driver.getEmail())){
+ String path1 = templatePath + "driver/index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if(1 == language){
+ document1.getElementById("english").remove();
+ document1.getElementById("french").remove();
+ document1.getElementById("invite").remove();
+ document1.getElementById("user").remove();
+ document1.getElementById("pass").remove();
+ document1.getElementById("email").remove();
+ document1.getElementById("bill").remove();
+ document1.getElementById("reward").remove();
+ document1.getElementById("rewardToday").remove();
+ document1.getElementById("driverAudit").remove();
+ document1.getElementById("carAudit").remove();
+
+ document1.getElementsByTag("title").get(0).text("成功注册");
+ Element settle_user = document1.getElementById("settle_user");
+ settle_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ }
+ if(2 == language){
+ document1.getElementById("chinese").remove();
+ document1.getElementById("french").remove();
+ document1.getElementById("invite1").remove();
+ document1.getElementById("user1").remove();
+ document1.getElementById("pass1").remove();
+ document1.getElementById("email1").remove();
+ document1.getElementById("bill1").remove();
+ document1.getElementById("reward1").remove();
+ document1.getElementById("rewardToday1").remove();
+ document1.getElementById("driverAudit1").remove();
+ document1.getElementById("carAudit1").remove();
+
+ document1.getElementsByTag("title").get(0).text("Registered successfully");
+ Element settle1_user = document1.getElementById("settle1_user");
+ settle1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ }
+ if(3 == language){
+ document1.getElementById("chinese").remove();
+ document1.getElementById("english").remove();
+ document1.getElementById("invite2").remove();
+ document1.getElementById("user2").remove();
+ document1.getElementById("pass2").remove();
+ document1.getElementById("email2").remove();
+ document1.getElementById("bill2").remove();
+ document1.getElementById("reward2").remove();
+ document1.getElementById("rewardToday2").remove();
+ document1.getElementById("driverAudit2").remove();
+ document1.getElementById("carAudit2").remove();
+
+ 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 ? "Registered successfully" : "Enregistré avec succès", document1.html());
+ String randomString = ToolUtil.getRandomString(10);
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document1.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(driver.getId());
+ tEmail.setType(2);
+ tEmail.setName(language == 1 ? "成功注册" : language == 2 ? "Registered successfully" : "Enregistré avec succès");
+ tEmail.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();
}
@@ -442,19 +922,107 @@
* @throws Exception
*/
@Override
- public ResultUtil resetPassword(String phone, String code, String password) throws Exception {
- boolean b = this.checkCaptcha(phone, code);
- if(!b){
- return ResultUtil.error("验证码无效");
- }
+ 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" : "CAPTCHA non valide");
+// }
Driver driver = driverMapper.queryByPhone(phone);
if(null == driver){
- return ResultUtil.error("电话号码未注册");
+ return ResultUtil.error(language == 1 ? "电话号码未注册" : language == 2 ? "Mobile phone number was not registered." : "Le numéro de téléphone portable n’a pas été enregistré.");
}
driver.setPassword(ShiroKit.md5(password, salt));
driverMapper.updateById(driver);
- smsrecordService.saveData(6, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
+ if(ToolUtil.isNotEmpty(driver.getEmail())){
+ String path1 = templatePath + "driver/index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if(1 == language){
+ document1.getElementById("english").remove();
+ document1.getElementById("french").remove();
+ document1.getElementById("invite").remove();
+ document1.getElementById("user").remove();
+ document1.getElementById("settle").remove();
+ document1.getElementById("email").remove();
+ document1.getElementById("bill").remove();
+ document1.getElementById("reward").remove();
+ document1.getElementById("rewardToday").remove();
+ document1.getElementById("driverAudit").remove();
+ document1.getElementById("carAudit").remove();
+
+ document1.getElementsByTag("title").get(0).text("密码重置");
+ Element pass_user = document1.getElementById("pass_user");
+ pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ }
+ if(2 == language){
+ document1.getElementById("chinese").remove();
+ document1.getElementById("french").remove();
+ document1.getElementById("invite1").remove();
+ document1.getElementById("user1").remove();
+ document1.getElementById("settle1").remove();
+ document1.getElementById("email1").remove();
+ document1.getElementById("bill1").remove();
+ document1.getElementById("reward1").remove();
+ document1.getElementById("rewardToday1").remove();
+ document1.getElementById("driverAudit1").remove();
+ document1.getElementById("carAudit1").remove();
+
+ document1.getElementsByTag("title").get(0).text("Reset password");
+ Element pass1_user = document1.getElementById("pass1_user");
+ pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ }
+ if(3 == language){
+ document1.getElementById("chinese").remove();
+ document1.getElementById("english").remove();
+ document1.getElementById("invite2").remove();
+ document1.getElementById("user2").remove();
+ document1.getElementById("settle2").remove();
+ document1.getElementById("email2").remove();
+ document1.getElementById("bill2").remove();
+ document1.getElementById("reward2").remove();
+ document1.getElementById("rewardToday2").remove();
+ document1.getElementById("driverAudit2").remove();
+ document1.getElementById("carAudit2").remove();
+
+ 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());
+ String randomString = ToolUtil.getRandomString(10);
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/usr/local/nginx/html/files/html/reset_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document1.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ String link ="http://182.160.16.251:81/files/html/reset_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(driver.getId());
+ tEmail.setType(2);
+ tEmail.setName(language == 1 ? "密码重置" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe");
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ String week = EmailUtil.getWeek(language, i);
+ tEmail.setWeek(week);
+ boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+ if(am){
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
+ }
+ emailService.insert(tEmail);
+ }
+
return ResultUtil.success();
}
@@ -496,24 +1064,24 @@
* @throws Exception
*/
@Override
- public ResultUtil<LoginWarpper> driverLogin(String phone, String password) throws Exception {
+ public ResultUtil<LoginWarpper> driverLogin(String phone, String password, Integer language) throws Exception {
Driver driver = driverMapper.queryByPhone(phone);
if(null == driver){
- return ResultUtil.error("账号未注册");
+ return ResultUtil.error(language == 1 ? "账号未注册" : language == 2 ? "Account unregistered" : "Compte non enregistré");
}
- /*if(driver.getAuthState() == 1){
- return ResultUtil.error("账号正在审核中，请耐心等待");
- }*/
+ if(driver.getAuthState() == 1){
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
+ }
if(driver.getAuthState() == 3){
- return ResultUtil.error("账号已被冻结，请联系管理员");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
}
if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){
- return ResultUtil.error("密码错误");
+ return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
}
String value = redisUtil.getValue("DEVICE_" + driver.getId());
if(ToolUtil.isNotEmpty(value)){
- return ResultUtil.error("当前账户正在车载端登录");
+ return ResultUtil.error(language == 1 ? "当前账户正在车载端登录" : language == 2 ? "The current account is logging in to the vehicle terminal" : "Le compte actuel est connecté côté voiture");
}
//调用单点登录逻辑
@@ -524,17 +1092,20 @@
loginWarpper.setId(driver.getId());
loginWarpper.setToken(token);
loginWarpper.setAppid(UUIDUtil.getRandomCode());
-
- //创建高德猎鹰的终端数据
- String tid = gdFalconUtil.createTerminal(phone);
- loginWarpper.setServerId(gdFalconUtil.getServerId());
- loginWarpper.setTerminalId(tid);
if(driver.getCompanyId()==null){
loginWarpper.setJumpCode("100000");
}else{
if(driver.getCarId()==null){
loginWarpper.setJumpCode("200000");
}
+ }
+
+ //司机登录，添加谷歌上的车辆信息
+ Car car = carService.selectById(driver.getCarId());
+ String vehicles = fleetEngineUtil.getVehicles(driver.getCarId());
+ if(ToolUtil.isEmpty(vehicles)){
+ CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+ fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), driver.getCarId());
}
return ResultUtil.success(loginWarpper);
}
@@ -547,26 +1118,29 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryHomeData(Integer uid) throws Exception {
+ public Map<String, Object> queryHomeData(Integer uid, Integer language) throws Exception {
Map<String, Object> map = driverMapper.queryHomeData(uid);
- int size = this.queryMyActivity(uid, new Date()).size();
+ int size = this.queryMyActivity(uid, new Date(), language).size();
map.put("activity", size);
//获取司机待支付的现金支付订单推送司机支付
- new Thread(new Runnable() {
- @Override
- public void run() {
- List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("driverId", uid).eq("payType", 4)
- .eq("driverPay", 1).eq("isDelete", 1));
- for (OrderPrivateCar orderPrivateCar : orderPrivateCars) {
- pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1);
- }
- List<OrderLogistics> orderLogistics = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().eq("driverId", uid).eq("payType", 4)
- .eq("isDelete", 1).eq("driverPay", 1));
- for (OrderLogistics orderLogistic : orderLogistics) {
- pushUtil.pushOfflinePayment(2, orderLogistic.getDriverId(), orderLogistic.getId(), orderLogistic.getType());
- }
- }
- }).start();
+// 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;
}
@@ -603,28 +1177,29 @@
* @throws Exception
*/
@Override
- public ResultUtil work(Integer uid, String type) throws Exception {
+ public ResultUtil work(Integer uid, String type, Integer language) throws Exception {
DriverWork driverWork = driverWorkMapper.queryNewWork(uid, null, 1);
Driver driver = this.selectById(uid);
+ Car car = carService.selectById(driver.getCarId());
if(null != driverWork){//作下班操作
//检测是否有未完成的订单
- List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid);
+ List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid, language);
if(list.size() > 0){
- return ResultUtil.error("还有未完成的订单，不能进行下班操作");
+ return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "There are still outstanding orders, can not be off-duty operation" : "Il y a encore des commandes en suspens qui ne peuvent pas être exécutées");
}
driverWork.setEndTime(new Date());
driverWork.setState(2);
driverWorkMapper.updateById(driverWork);
driver.setState(1);
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){//上传数据
- pushMinistryOfTransportUtil.operateLogout(uid);
- }
- }
- }).start();
+
+ //司机下班，修改谷歌上的车辆信息
+ CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+ String vehicles = fleetEngineUtil.getVehicles(driver.getCarId());
+ if(ToolUtil.isEmpty(vehicles)){
+ fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), driver.getCarId());
+ }else{
+ fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), driver.getCarId());
+ }
}else{
LoginWarpper loginWarpper = new LoginWarpper();
if(driver.getCompanyId()==null){
@@ -638,20 +1213,19 @@
}
//判断是否存在审核中的资料
if(driver.getAuthState()==1){
- return ResultUtil.error("资料审核中，不能出车");
+ return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data is being reviewed, unable to drive." : "Les données sont en cours d’examen, il est impossible de conduire.");
}
if(driver.getAuthState()==4){
- return ResultUtil.error("请完善资料后再出车");
+ return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire.");
}
- Car car = carService.selectById(driver.getCarId());
if(car==null){
- return ResultUtil.error("请完善资料后再出车");
+ return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire.");
}
if(car.getAuthState()==1){
- return ResultUtil.error("资料审核中，不能出车");
+ return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data is being reviewed, unable to drive." : "Les données sont en cours d’examen, il est impossible de conduire.");
}
if(car.getAuthState()==4){
- return ResultUtil.error("请完善资料后再出车");
+ return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire.");
}
driverWork = new DriverWork();
driverWork.setState(1);
@@ -660,15 +1234,15 @@
driverWork.setType(type);
driverWorkMapper.insert(driverWork);
driver.setState(2);
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){ //上传数据
- pushMinistryOfTransportUtil.operateLogin(uid);
- }
- }
- }).start();
+
+ //司机上班，修改谷歌上的车辆信息
+ CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+ String vehicles = fleetEngineUtil.getVehicles(driver.getCarId());
+ if(ToolUtil.isEmpty(vehicles)){
+ fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), driver.getCarId());
+ }else{
+ fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), driver.getCarId());
+ }
}
this.updateById(driver);
return ResultUtil.success();
@@ -678,12 +1252,12 @@
@Override
- public ResultUtil work2(Integer uid, String type) throws Exception {
+ public ResultUtil work2(Integer uid, String type, Integer language) throws Exception {
//判断是否已经上班，如果已经上班则先下班操作
DriverWork driverWork1 = driverWorkMapper.queryNewWork(uid, null, 1);
if(null != driverWork1){
if(!driverWork1.getType().equals("2")){
- return ResultUtil.error("请先将其他业务下班后再进行上班操作");
+ return ResultUtil.error(language == 1 ? "请先将其他业务下班后再进行上班操作" : language == 2 ? "Please do other business after work first" : "S’il vous plaît faire d’autres affaires après les heures de travail avant de travailler");
}
}
@@ -691,23 +1265,14 @@
Driver driver = this.selectById(uid);
if(null != driverWork){//作下班操作
//检测是否有未完成的订单
- List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid);
+ List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid, language);
if(list.size() > 0){
- return ResultUtil.error("还有未完成的订单，不能进行下班操作");
+ return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "There are still outstanding orders, can not be off-duty operation" : "Il y a encore des commandes en suspens qui ne peuvent pas être exécutées");
}
driverWork.setEndTime(new Date());
driverWork.setState(2);
driverWorkMapper.updateById(driverWork);
driver.setState(1);
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){//上传数据
- pushMinistryOfTransportUtil.operateLogout(uid);
- }
- }
- }).start();
}else{
LoginWarpper loginWarpper = new LoginWarpper();
if(driver.getCompanyId()==null){
@@ -734,7 +1299,7 @@
if(Integer.valueOf(t) == 3){
CarService query1 = carServiceMapper.query(3, driver.getCarId());
if(query1 == null){
- return ResultUtil.error("车辆未添加跨城服务");
+ return ResultUtil.error(language == 1 ? "车辆未添加跨城服务" : language == 2 ? "No cross-city service is added to the vehicle" : "Véhicule non ajouté pour le service cross city");
}
}
DriverOrders query = driverOrdersMapper.query(uid, Integer.valueOf(t));
@@ -745,16 +1310,6 @@
driverOrdersMapper.insert(driverOrders);
}
}
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){
- //上传数据
- pushMinistryOfTransportUtil.operateLogin(uid);
- }
- }
- }).start();
}
this.updateById(driver);
return ResultUtil.success();
@@ -768,16 +1323,16 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryHomeNum(Integer uid) throws Exception {
+ public Map<String, Object> queryHomeNum(Integer uid, Integer language) throws Exception {
Map<String, Object> map = new HashMap<>();
//出租车
- List<Map<String, Object>> list = orderTaxiService.queryOrderList(1, uid);
+ List<Map<String, Object>> list = orderTaxiService.queryOrderList(language, 1, uid);
map.put("service", list.size());//服务中
- list = orderTaxiService.queryOrderList(2, uid);
+ list = orderTaxiService.queryOrderList(language, 2, uid);
map.put("reservation", list.size());//预约
- List<Map<String, Object>> list1 = orderLogisticsService.queryOrderList(uid);
+ List<Map<String, Object>> list1 = orderLogisticsService.queryOrderList(uid, language);
map.put("small", list1.size());//小件
- int size = this.queryMyActivity(uid, new Date()).size();
+ int size = this.queryMyActivity(uid, new Date(), language).size();
map.put("activity", size);//活动
return map;
}
@@ -790,7 +1345,7 @@
* @throws Exception
*/
@Override
- public List<BaseWarpper> queryMyBusiness(Integer uid) throws Exception {
+ public List<BaseWarpper> queryMyBusiness(Integer uid, Integer language) throws Exception {
List<DriverService> list = driverServiceMapper.queryMyBusiness(uid);
List<BaseWarpper> maps = new ArrayList<>();
for (DriverService d : list){
@@ -798,19 +1353,19 @@
baseWarpper.setId(d.getType());
switch (d.getType()){
case 1:
- baseWarpper.setName("专车");
+ baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
break;
case 2:
- baseWarpper.setName("出租车");
+ baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi");
break;
case 3:
- baseWarpper.setName("跨城出行");
+ baseWarpper.setName(language == 1 ? "跨城出行" : language == 2 ? "Cross-town travel" : "Se déplacer à travers la ville");
break;
case 4:
- baseWarpper.setName("同城小件物流");
+ baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Delivery" : "Livraison");
break;
case 5:
- baseWarpper.setName("跨城小件物流");
+ baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville");
break;
}
maps.add(baseWarpper);
@@ -833,8 +1388,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();
@@ -856,21 +1423,20 @@
* @throws Exception
*/
@Override
- public ResultUtil updatePhone(String phone, String code, Integer uid) throws Exception {
+ public ResultUtil updatePhone(String phoneOperator, String phone, String code, Integer uid, Integer language) throws Exception {
Driver driver = driverMapper.queryByPhone(phone);
if(null != driver){
- return ResultUtil.error("电话号码已被注册");
+ return ResultUtil.error(language == 1 ? "电话号码已被注册" : language == 2 ? "Mobile phone number has been registered." : "Le numéro de téléphone portable a été enregistré.");
}
- boolean b = this.checkCaptcha(phone, code);
+ boolean b = this.checkCaptcha("", phone, code);
if(!b){
- return ResultUtil.error("验证码无效");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}
Driver driver1 = this.selectById(uid);
driver1.setAccount(phone);
+ driver1.setPhoneOperator(phoneOperator);
driver1.setPhone(phone);
this.updateById(driver1);
-
- smsrecordService.saveData(7, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
return ResultUtil.success();
}
@@ -901,10 +1467,98 @@
* @throws Exception
*/
@Override
- public void updatePassword(String password, Integer uid) throws Exception {
+ public void updatePassword(String password, Integer uid, Integer language) throws Exception {
Driver driver = this.selectById(uid);
driver.setPassword(ShiroKit.md5(password, salt));
this.updateById(driver);
+ if(ToolUtil.isNotEmpty(driver.getEmail())){
+ String path1 = templatePath + "driver/index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if(1 == language){
+ document1.getElementById("english").remove();
+ document1.getElementById("french").remove();
+ document1.getElementById("invite").remove();
+ document1.getElementById("user").remove();
+ document1.getElementById("settle").remove();
+ document1.getElementById("email").remove();
+ document1.getElementById("bill").remove();
+ document1.getElementById("reward").remove();
+ document1.getElementById("rewardToday").remove();
+ document1.getElementById("driverAudit").remove();
+ document1.getElementById("carAudit").remove();
+
+ document1.getElementsByTag("title").get(0).text("密码重置");
+ Element pass_user = document1.getElementById("pass_user");
+ pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ }
+ if(2 == language){
+ document1.getElementById("chinese").remove();
+ document1.getElementById("french").remove();
+ document1.getElementById("invite1").remove();
+ document1.getElementById("user1").remove();
+ document1.getElementById("settle1").remove();
+ document1.getElementById("email1").remove();
+ document1.getElementById("bill1").remove();
+ document1.getElementById("reward1").remove();
+ document1.getElementById("rewardToday1").remove();
+ document1.getElementById("driverAudit1").remove();
+ document1.getElementById("carAudit1").remove();
+
+ document1.getElementsByTag("title").get(0).text("Reset password");
+ Element pass1_user = document1.getElementById("pass1_user");
+ pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ }
+ if(3 == language){
+ document1.getElementById("chinese").remove();
+ document1.getElementById("english").remove();
+ document1.getElementById("invite2").remove();
+ document1.getElementById("user2").remove();
+ document1.getElementById("settle2").remove();
+ document1.getElementById("email2").remove();
+ document1.getElementById("bill2").remove();
+ document1.getElementById("reward2").remove();
+ document1.getElementById("rewardToday2").remove();
+ document1.getElementById("driverAudit2").remove();
+ document1.getElementById("carAudit2").remove();
+
+ 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());
+ String randomString = ToolUtil.getRandomString(10);
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/usr/local/nginx/html/files/html/reset_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document1.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ String link ="http://182.160.16.251:81/files/html/reset_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(driver.getId());
+ tEmail.setType(2);
+ tEmail.setName(language == 1 ? "密码重置" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe");
+ tEmail.setCreateTime(new Date());
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
+ String week = EmailUtil.getWeek(language, i);
+ tEmail.setWeek(week);
+ boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
+ if(am){
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
+ }else {
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
+ }
+ emailService.insert(tEmail);
+ }
}
@@ -916,14 +1570,27 @@
* @throws Exception
*/
@Override
- public ResultUtil replaceCar(Integer carId, Integer uid) throws Exception {
+ public ResultUtil replaceCar(Integer carId, Integer uid, Integer language) throws Exception {
Driver driver = this.selectById(uid);
if(driver.getState() == 3){
- return ResultUtil.error("还在服务中，不能更换");
+ return ResultUtil.error(language == 1 ? "还在服务中，不能更换" : language == 2 ? "On trip, unable to change." : "En service, il est impossible de se changer.");
+ }
+ Car car = carService.selectById(carId);
+ if(null == car){
+ return ResultUtil.error(language == 1 ? "车辆无效" : language == 2 ? "Invalid vehicle" : "Véhicule non valide");
+ }
+ if(car.getAuthState() == 1){
+ return ResultUtil.error(language == 1 ? "车辆正在审核中" : language == 2 ? "Vehicle is being reviewed." : "Le véhicule est en cours d’examen.");
+ }
+ if(car.getAuthState() == 3){
+ return ResultUtil.error(language == 1 ? "车辆已冻结" : language == 2 ? "Vehicle is frozen." : "Le véhicule est gelé.");
+ }
+ if(car.getAuthState() == 4){
+ return ResultUtil.error(language == 1 ? "车辆审核不通过" : language == 2 ? "Vehicle is not verified and qualified." : "Le véhicule n’est pas vérifié ni qualifié.");
}
boolean idle = carService.idle(carId);
if(!idle){
- return ResultUtil.error("车辆已被绑定了");
+ return ResultUtil.error(language == 1 ? "车辆已被绑定了" : language == 2 ? "Vehicle has been bound." : "Le véhicule a été connecté.");
}
driver.setCarId(carId);
this.updateById(driver);
@@ -995,8 +1662,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;
}
@@ -1010,8 +1677,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;
}
@@ -1025,8 +1692,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;
}
@@ -1038,59 +1705,70 @@
* @throws Exception
*/
@Override
- public List<ActivityWarpper> queryMyActivity(Integer uid, Date time) throws Exception {
+ public List<ActivityWarpper> queryMyActivity(Integer uid, Date time, Integer language) throws Exception {
List<ActivityWarpper> list = new ArrayList<>();
Map<String, Date> date = dateUtil.getStartAndEndDate(time);
List<DriverActivityHistory> driverActivityHistories = driverActivityHistoryMapper.queryList(uid, null, null, date.get("startTime"), date.get("endTime"));
+
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
for(DriverActivityHistory dah : driverActivityHistories){
ActivityWarpper activityWarpper = new ActivityWarpper();
switch (dah.getType()){
case 1://邀请司机注册
DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityRegistered.getId());
- activityWarpper.setContent("邀请司机注册奖励" + driverActivityRegistered.getMoney() + "元");
+ activityWarpper.setContent(language == 1 ? "邀请司机注册奖励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("专车");
+ 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 ? "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);
@@ -1106,9 +1784,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;
}
@@ -1119,6 +1804,7 @@
@Override
public void addTodayActivity() throws Exception {
List<Company> companies = companyMapper.selectList(new EntityWrapper<Company>().eq("state", 0).ne("flag", 3));
+ Integer language = 2;
//获取每个企业的活动数据
for(Company company : companies){
//企业下的所有司机
@@ -1136,6 +1822,107 @@
driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
driverActivityHistory.setInsertTime(new Date());
driverActivityHistoryMapper.insert(driverActivityHistory);
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())) {
+ String path1 = templatePath + "driver/index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if (1 == language) {
+ document1.getElementById("english").remove();
+ document1.getElementById("french").remove();
+ document1.getElementById("invite").remove();
+ document1.getElementById("user").remove();
+ document1.getElementById("settle").remove();
+ document1.getElementById("pass").remove();
+ document1.getElementById("email").remove();
+ document1.getElementById("bill").remove();
+ document1.getElementById("reward").remove();
+ document1.getElementById("driverAudit").remove();
+ document1.getElementById("carAudit").remove();
+
+ document1.getElementsByTag("title").get(0).text("邀请司机奖励（活动）");
+ Element rewardToday_user = document1.getElementById("rewardToday_user");
+ rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ Element rewardToday_award = document1.getElementById("rewardToday_award");
+ rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
+ Element rewardToday_content = document1.getElementById("rewardToday_content");
+ rewardToday_content.text("邀请司机注册即可获得奖励。\n注意此活动是有时间限制的，详情请查看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.text("Get a bonus on I-GO today.\nInvite drivers to register to get the bonus.\nNote that this is a limited-time offer. Check your app for more details.");
+ }
+ if (3 == language) {
+ document1.getElementById("chinese").remove();
+ 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.text("Obtenez un bonus sur I-GO dès aujourd’hui.\nInvitez les chauffeurs à s’inscrire pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "邀请司机奖励（活动）" : language == 2 ? "Invite drivers and earn" : "Invitez des chauffeurs et gagnez de l’argent", document1.html());
+ String randomString = ToolUtil.getRandomString(10);
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document1.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(driver.getId());
+ tEmail.setType(2);
+ tEmail.setName(language == 1 ? "邀请司机奖励（活动）" : language == 2 ? "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);
+ }
}
}
//邀请用户注册
@@ -1151,11 +1938,113 @@
driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
driverActivityHistory.setInsertTime(new Date());
driverActivityHistoryMapper.insert(driverActivityHistory);
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())) {
+ String path1 = templatePath + "driver/index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if (1 == language) {
+ document1.getElementById("english").remove();
+ document1.getElementById("french").remove();
+ document1.getElementById("invite").remove();
+ document1.getElementById("user").remove();
+ document1.getElementById("settle").remove();
+ document1.getElementById("pass").remove();
+ document1.getElementById("email").remove();
+ document1.getElementById("bill").remove();
+ document1.getElementById("reward").remove();
+ document1.getElementById("driverAudit").remove();
+ document1.getElementById("carAudit").remove();
+
+ document1.getElementsByTag("title").get(0).text("邀请用户奖励(活动)");
+ Element rewardToday_user = document1.getElementById("rewardToday_user");
+ rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ Element rewardToday_award = document1.getElementById("rewardToday_award");
+ rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
+ Element rewardToday_content = document1.getElementById("rewardToday_content");
+ rewardToday_content.text("邀请用户注册即可获得奖励。\n 注意此活动是有时间限制的，详情请查看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.text("Get a bonus on I-GO today.\nInvite users to register to get the bonus.\nNote that this is a limited-time offer. Check your app for more details.");
+ }
+ if (3 == language) {
+ document1.getElementById("chinese").remove();
+ 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.text("Obtenez un bonus sur I-GO dès aujourd’hui.\nInvitez les utilisateurs à s’inscrire pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "邀请用户奖励(活动)" : language == 2 ? "Invite users and earn" : "Invitez des utilisateurs et gagnez de l’argent", document1.html());
+ String randomString = ToolUtil.getRandomString(10);
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document1.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(driver.getId());
+ tEmail.setType(2);
+ tEmail.setName(language == 1 ? "邀请用户奖励(活动)" : language == 2 ? "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);
+ }
}
}
//累计在线
query = driverActivityOnlineMapper.query(company.getId());
for(Map<String, Object> map : query){
+ DriverActivityOnline driverActivityOnline = driverActivityOnlineMapper.selectById(Integer.valueOf(String.valueOf(map.get("id"))));
for(Driver driver : drivers){
DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
@@ -1166,11 +2055,113 @@
driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
driverActivityHistory.setInsertTime(new Date());
driverActivityHistoryMapper.insert(driverActivityHistory);
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())) {
+ String path1 = templatePath + "driver/index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if (1 == language) {
+ document1.getElementById("english").remove();
+ document1.getElementById("french").remove();
+ document1.getElementById("invite").remove();
+ document1.getElementById("user").remove();
+ document1.getElementById("settle").remove();
+ document1.getElementById("pass").remove();
+ document1.getElementById("email").remove();
+ document1.getElementById("bill").remove();
+ document1.getElementById("reward").remove();
+ document1.getElementById("driverAudit").remove();
+ document1.getElementById("carAudit").remove();
+
+ document1.getElementsByTag("title").get(0).text("在线时长奖励（活动）");
+ Element rewardToday_user = document1.getElementById("rewardToday_user");
+ rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ Element rewardToday_award = document1.getElementById("rewardToday_award");
+ rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
+ Element rewardToday_content = document1.getElementById("rewardToday_content");
+ rewardToday_content.text("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。\n 注意此活动是有时间限制的，详情请查看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.text("Get a bonus for driving on I-GO today.\nStay online for " + driverActivityOnline.getOnline() + " hours to get the bonus.\nNote that this is a limited-time offer. Check your app for more details.");
+ }
+ if (3 == language) {
+ document1.getElementById("chinese").remove();
+ 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.text("Obtenez un bonus pour conduire sur I-GO dès aujourd’hui.\nRestez en ligne pendant " + driverActivityOnline.getOnline() + " heures pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "在线时长奖励（活动）" : language == 2 ? "Online-duration reward activity" : "Activité de récompense en ligne", document1.html());
+ String randomString = ToolUtil.getRandomString(10);
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document1.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(driver.getId());
+ tEmail.setType(2);
+ tEmail.setName(language == 1 ? "在线时长奖励（活动）" : language == 2 ? "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);
+ }
}
}
//订单量
query = driverActivityOrderMapper.query(company.getId());
for(Map<String, Object> map : query){
+ DriverActivityOrder driverActivityOrder = driverActivityOrderMapper.selectById(Integer.valueOf(String.valueOf(map.get("id"))));
for(Driver driver : drivers){
DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
@@ -1181,6 +2172,107 @@
driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
driverActivityHistory.setInsertTime(new Date());
driverActivityHistoryMapper.insert(driverActivityHistory);
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())) {
+ String path1 = templatePath + "driver/index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if (1 == language) {
+ document1.getElementById("english").remove();
+ document1.getElementById("french").remove();
+ document1.getElementById("invite").remove();
+ document1.getElementById("user").remove();
+ document1.getElementById("settle").remove();
+ document1.getElementById("pass").remove();
+ document1.getElementById("email").remove();
+ document1.getElementById("bill").remove();
+ document1.getElementById("reward").remove();
+ document1.getElementById("driverAudit").remove();
+ document1.getElementById("carAudit").remove();
+
+ document1.getElementsByTag("title").get(0).text("累计接单奖励（活动）");
+ Element rewardToday_user = document1.getElementById("rewardToday_user");
+ rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ Element rewardToday_award = document1.getElementById("rewardToday_award");
+ rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
+ Element rewardToday_content = document1.getElementById("rewardToday_content");
+ rewardToday_content.text("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。\n 注意此活动是有时间限制的，详情请查看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.text("Get a bonus for driving on I-GO today.\nStay online and complete " + driverActivityOrder.getOrderNum() + " trips to get the bonus.\nNote that this is a limited-time offer. Check your app for more details.");
+ }
+ if (3 == language) {
+ document1.getElementById("chinese").remove();
+ 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.text("Obtenez un bonus pour conduire sur I-GO dès aujourd’hui.\nRestez en ligne et effectuez " + driverActivityOrder.getOrderNum() + " trajets pour obtenir le bonus.\nNotez qu’il s’agit d’une offre d’une durée limitée. Consultez votre application pour plus de détails.");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "累计接单奖励（活动）" : language == 2 ? "Cumulative order activity" : "Activité cumulée des commandes", document1.html());
+ String randomString = ToolUtil.getRandomString(10);
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/usr/local/nginx/html/files/html/activity_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document1.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ String link ="http://182.160.16.251:81/files/html/activity_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(driver.getId());
+ tEmail.setType(2);
+ tEmail.setName(language == 1 ? "累计接单奖励（活动）" : language == 2 ? "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);
+ }
}
}
}
@@ -1194,13 +2286,19 @@
@Override
public void taskMinute() throws Exception {
Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
+ Integer language = 2;
//在线时长
List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(null, 3, 1, date.get("startTime"), date.get("endTime"));
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
for(DriverActivityHistory dah : list){
DriverActivityOnline dao = driverActivityOnlineMapper.selectById(dah.getActivityId());
- List<DriverWork> query = driverWorkMapper.query(dao.getType(), dao.getOnline());//满足活动条件的数据
- for(DriverWork dw : query){
- if(dah.getDriverId().compareTo(dw.getDriverId()) == 0){
+ if(null == dao){
+ continue;
+ }
+ Long duration = Long.valueOf(dao.getOnline() * 3600);
+ List<DriverOnline> driverOnlines = driverOnlineMapper.queryList(sdf.format(new Date()), dao.getType(), duration);
+ for (DriverOnline driverOnline : driverOnlines) {
+ if(dah.getDriverId().compareTo(driverOnline.getDriverId()) == 0){
dah.setCarryOut(2);//完成状态
driverActivityHistoryMapper.updateById(dah);
//修改余额
@@ -1214,7 +2312,103 @@
this.updateById(driver);
//添加收入记录
- incomeService.saveData(2, dw.getDriverId(), 1, dao.getId(), null, dah.getMoney());
+ incomeService.saveData(2, driverOnline.getDriverId(), 1, dah.getId(), null, dah.getMoney());
+
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())) {
+ String path1 = templatePath + "driver/index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if (1 == language) {
+ document1.getElementById("english").remove();
+ document1.getElementById("french").remove();
+ document1.getElementById("invite").remove();
+ document1.getElementById("user").remove();
+ document1.getElementById("settle").remove();
+ document1.getElementById("pass").remove();
+ document1.getElementById("email").remove();
+ document1.getElementById("bill").remove();
+ document1.getElementById("rewardToday").remove();
+ document1.getElementById("driverAudit").remove();
+ document1.getElementById("carAudit").remove();
+
+ document1.getElementsByTag("title").get(0).text("司机奖励通知");
+ Element reward_user = document1.getElementById("reward_user");
+ reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ Element reward_content = document1.getElementById("reward_content");
+ reward_content.text("今日累计在线" + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收。\n详情请查看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.text("You stayed online for " + dao.getOnline() + " hours today, and got a bonus of GHS" + dah.getMoney() + ", please check.\nCheck your app for more details.");
+ }
+ if (3 == language) {
+ document1.getElementById("chinese").remove();
+ 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.text("Vous êtes resté en ligne pendant " + dao.getOnline() + " heures aujourd’hui et avez obtenu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.\nConsultez votre application pour plus de détails.");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
+ String randomString = ToolUtil.getRandomString(10);
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/usr/local/nginx/html/files/html/rewards_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document1.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ String link ="http://182.160.16.251:81/files/html/rewards_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(driver.getId());
+ tEmail.setType(2);
+ tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "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);
+ }
}
}
}
@@ -1238,7 +2432,103 @@
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());
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())) {
+ String path1 = templatePath + "driver/index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if (1 == language) {
+ document1.getElementById("english").remove();
+ document1.getElementById("french").remove();
+ document1.getElementById("invite").remove();
+ document1.getElementById("user").remove();
+ document1.getElementById("settle").remove();
+ document1.getElementById("pass").remove();
+ document1.getElementById("email").remove();
+ document1.getElementById("bill").remove();
+ document1.getElementById("rewardToday").remove();
+ document1.getElementById("driverAudit").remove();
+ document1.getElementById("carAudit").remove();
+
+ document1.getElementsByTag("title").get(0).text("司机奖励通知");
+ Element reward_user = document1.getElementById("reward_user");
+ reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
+ Element reward_content = document1.getElementById("reward_content");
+ reward_content.text("今日累计接单" + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收。\n详情请查看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.text("You completed " + dao.getOrderNum() + " trips today, and got a bonus of GHS" + dah.getMoney() + ", please check.\nCheck your app for more details.");
+ }
+ if (3 == language) {
+ document1.getElementById("chinese").remove();
+ 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.text("Vous avez effectué " + dao.getOrderNum() + " trajets aujourd’hui et avez reçu un bonus de GHS" + dah.getMoney() + ", veuillez vérifier.\nConsultez votre application pour plus de détails.");
+ }
+
+ EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense", document1.html());
+ String randomString = ToolUtil.getRandomString(10);
+ //开始生成pdf收据和html收据
+ File file = new File("/usr/local/nginx/html/files/html/");
+ if(!file.exists()){
+ file.mkdirs();
+ }
+ file = new File("/usr/local/nginx/html/files/html/rewards_" + randomString + ".html");
+ if(!file.exists()){
+ file.createNewFile();
+ }
+ FileWriter fileWriter = new FileWriter(file);
+ fileWriter.write(document1.html());
+ fileWriter.flush();
+ fileWriter.close();
+
+ String link ="http://182.160.16.251:81/files/html/rewards_" + randomString + ".html";
+ TEmail tEmail = new TEmail();
+ tEmail.setLink(link);
+ tEmail.setUserId(driver.getId());
+ tEmail.setType(2);
+ tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "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);
+ }
}
}
}
@@ -1249,16 +2539,16 @@
* @return
*/
@Override
- public ResultUtil loginByJobNumber(String jobNum) {
+ public ResultUtil loginByJobNumber(String jobNum, Integer language) {
Driver driver = driverMapper.queryByJobNum(jobNum);
if(null == driver){
- return ResultUtil.error("账号未注册，请先注册账号");
+ return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte.");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error("账号正在审核中，请耐心等待");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error("账号已被冻结，请联系管理员");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
}
List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
boolean b = true;
@@ -1269,7 +2559,7 @@
}
}
if(b){
- return ResultUtil.error("没有出租车业务权限");
+ return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
}
//开始自动设置接单类型，出车类型，上班状态
@@ -1347,16 +2637,16 @@
* @throws Exception
*/
@Override
- public ResultUtil loginByIdentification(String identification) throws Exception {
+ public ResultUtil loginByIdentification(String identification, Integer language) throws Exception {
Driver driver = driverMapper.queryByIdentification(identification);
if(null == driver){
- return ResultUtil.error("账号未注册，请先注册账号");
+ return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte.");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error("账号正在审核中，请耐心等待");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error("账号已被冻结，请联系管理员");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
}
List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
boolean b = true;
@@ -1367,7 +2657,7 @@
}
}
if(b){
- return ResultUtil.error("没有出租车业务权限");
+ return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
}
//开始自动设置接单类型，出车类型，上班状态
@@ -1433,16 +2723,16 @@
* @throws Exception
*/
@Override
- public ResultUtil loginByTaxiAptitudeCard(String taxiAptitudeCard) throws Exception {
+ public ResultUtil loginByTaxiAptitudeCard(String taxiAptitudeCard, Integer language) throws Exception {
Driver driver = driverMapper.queryByTaxiAptitudeCard(taxiAptitudeCard);
if(null == driver){
- return ResultUtil.error("账号未注册，请先注册账号");
+ return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte.");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error("账号正在审核中，请耐心等待");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error("账号已被冻结，请联系管理员");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
}
List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
boolean b = true;
@@ -1453,7 +2743,7 @@
}
}
if(b){
- return ResultUtil.error("没有出租车业务权限");
+ return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
}
//开始自动设置接单类型，出车类型，上班状态
@@ -1539,13 +2829,13 @@
* @throws Exception
*/
@Override
- public ResultUtil verificationPassword(String password, Integer driverId) throws Exception {
+ public ResultUtil verificationPassword(String password, Integer driverId, Integer language) throws Exception {
Driver driver = this.selectById(driverId);
if(null == driver){
- return ResultUtil.error("账户无效，请重新登录");
+ return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau.");
}
if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){
- return ResultUtil.error("密码错误");
+ return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
}
return ResultUtil.success();
}
@@ -1558,10 +2848,10 @@
* @throws Exception
*/
@Override
- public ResultUtil setWithdrawPassword(String withdrawPassword, Integer driverId) throws Exception {
+ public ResultUtil setWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception {
Driver driver = this.selectById(driverId);
if(null == driver){
- return ResultUtil.error("账户无效，请重新登录");
+ return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau.");
}
driver.setWithdrawPassword(ShiroKit.md5(withdrawPassword, salt));
this.updateById(driver);
@@ -1577,16 +2867,16 @@
* @throws Exception
*/
@Override
- public ResultUtil verificationWithdrawPassword(String withdrawPassword, Integer driverId) throws Exception {
+ public ResultUtil verificationWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception {
Driver driver = this.selectById(driverId);
if(null == driver){
- return ResultUtil.error("账户无效，请重新登录");
+ return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau.");
}
if(null == driver.getWithdrawPassword()){
- return ResultUtil.error("请先设置提现密码");
+ return ResultUtil.error(language == 1 ? "请先设置提现密码" : language == 2 ? "Please set withdrawal password first." : "Veuillez d’abord définir le mot de passe de retrait.");
}
if(!driver.getWithdrawPassword().equals(ShiroKit.md5(withdrawPassword, salt))){
- return ResultUtil.error("密码错误");
+ return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
}
return ResultUtil.success();
}
@@ -1622,14 +2912,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;
@@ -1692,6 +2996,7 @@
redisUtil.remove("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存
redisUtil.remove("DRIVER_" + id);//清除存储的token
}
+
}
@Override
--
Gitblit v1.7.1