From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 807 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 718 insertions(+), 89 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 0ac6f4f..de77901 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
@@ -27,12 +27,16 @@
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.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -116,9 +120,6 @@
@Autowired
private IOrderTaxiService orderTaxiService;
- @Autowired
- private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
@Resource
private CarServiceMapper carServiceMapper;
@@ -134,8 +135,11 @@
@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#";
@@ -157,56 +161,92 @@
* @throws Exception
*/
@Override
- public ResultUtil queryCaptcha(String phone, Integer type) throws Exception {
+ public ResultUtil queryCaptcha(String phone, Integer type, 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分钟后失效，请及时登录!";
+ String sms = "短信验证码【" + authCode + "】已发到您的手机，验证码将在5分钟后失效.";
//发送验证码短信
redisUtil.setStrValue(phone, authCode, 5 * 60);//设置五分钟过期
- String templateCode = "";
- switch (type){
- case 1:
- templateCode = "SMS_207770039";//身份验证
- break;
- case 2:
- templateCode = "SMS_207770039";//登录确认
- break;
- case 3:
- templateCode = "SMS_207770039";//用户注册
- break;
- case 4:
- templateCode = "SMS_207770039";//修改密码
- 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.send_huawei_sms("b793ae3d41a049059197bfe92cf8bc83", "+233" + phone, "[\"" + authCode + "\"]");
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 + "index.html";
+ Document document = Jsoup.parse(new File(path), "UTF-8");
+ if(1 == language){
+ document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("invite").attr("style", "display: none;");
+ document.getElementById("user").attr("style", "display: none;");
+ document.getElementById("settle").attr("style", "display: none;");
+ document.getElementById("pass").attr("style", "display: none;");
+ document.getElementById("bill").attr("style", "display: none;");
+ document.getElementById("reward").attr("style", "display: none;");
+ document.getElementById("rewardToday").attr("style", "display: none;");
+ document.getElementById("driverAudit").attr("style", "display: none;");
+ document.getElementById("carAudit").attr("style", "display: none;");
+
+ 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").attr("style", "display: none;");
+ document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("invite1").attr("style", "display: none;");
+ document.getElementById("user1").attr("style", "display: none;");
+ document.getElementById("settle1").attr("style", "display: none;");
+ document.getElementById("pass1").attr("style", "display: none;");
+ document.getElementById("bill1").attr("style", "display: none;");
+ document.getElementById("reward1").attr("style", "display: none;");
+ document.getElementById("rewardToday1").attr("style", "display: none;");
+ document.getElementById("driverAudit1").attr("style", "display: none;");
+ document.getElementById("carAudit1").attr("style", "display: none;");
+
+ Element email1_user = document.getElementById("email1_user");
+ email1_user.text("Hello ，");
+ Element email1_content = document.getElementById("email1_content");
+ email1_content.text("verification code is " + authCode + ", please complete the verification within 5 minutes. If the request wasn't made by you, please ignore this email.");
+ }
+ if(3 == language){
+ document.getElementById("chinese").attr("style", "display: none;");
+ document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("invite2").attr("style", "display: none;");
+ document.getElementById("user2").attr("style", "display: none;");
+ document.getElementById("settle2").attr("style", "display: none;");
+ document.getElementById("pass2").attr("style", "display: none;");
+ document.getElementById("bill2").attr("style", "display: none;");
+ document.getElementById("reward2").attr("style", "display: none;");
+ document.getElementById("rewardToday2").attr("style", "display: none;");
+ document.getElementById("driverAudit2").attr("style", "display: none;");
+ document.getElementById("carAudit2").attr("style", "display: none;");
+
+ Element email2_user = document.getElementById("email2_user");
+ email2_user.text("Hello ，");
+ Element email2_content = document.getElementById("email2_content");
+ email2_content.text("Vous êtes lié à une adresse e-mail. Le code de vérification e-mail pour cette demande est: " + authCode + ". Veuillez compléter la vérification dans les 5 minutes");
+ }
+ EmailUtil.send(email, language == 1 ? "验证码" : language == 2 ? "Verification code" : "Code de vérification", document.html());
return ResultUtil.success();
}
@@ -237,10 +277,10 @@
* @throws Exception
*/
@Override
- public ResultUtil registeredDriver(String phone, String code, String password, Integer uid, Integer type, Integer userType) throws Exception {
+ public ResultUtil registeredDriver(String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language) throws Exception {
ResultUtil<LoginWarpper> result = this.registeredDriver(phone, code, password,uid,type);
if(result.getCode() == 200 && null != uid){
- /*if(type == 2){
+ if(type == 2){
Driver driver = driverMapper.selectById(uid);
List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
BigDecimal bigDecimal = new BigDecimal("0");
@@ -254,6 +294,67 @@
driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driverMapper.updateById(driver);
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())){
+ String path = templatePath + "index.html";
+ Document document = Jsoup.parse(new File(path), "UTF-8");
+ if(1 == language){
+ document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("user").attr("style", "display: none;");
+ document.getElementById("settle").attr("style", "display: none;");
+ document.getElementById("pass").attr("style", "display: none;");
+ document.getElementById("email").attr("style", "display: none;");
+ document.getElementById("bill").attr("style", "display: none;");
+ document.getElementById("reward").attr("style", "display: none;");
+ document.getElementById("rewardToday").attr("style", "display: none;");
+ document.getElementById("driverAudit").attr("style", "display: none;");
+ document.getElementById("carAudit").attr("style", "display: none;");
+
+ Element invite_user = document.getElementById("invite_user");
+ invite_user.text("您好 " + driver.getName() + "，");
+ Element invite_content = document.getElementById("invite_content");
+ invite_content.text("您已成功邀请一位司机注册I-GO，获得奖励GHS " + bigDecimal.doubleValue() + "，请查收");
+ }
+ if(2 == language){
+ document.getElementById("chinese").attr("style", "display: none;");
+ document.getElementById("french").attr("style", "display: none;");
+ document.getElementById("user1").attr("style", "display: none;");
+ document.getElementById("settle1").attr("style", "display: none;");
+ document.getElementById("pass1").attr("style", "display: none;");
+ document.getElementById("email1").attr("style", "display: none;");
+ document.getElementById("bill1").attr("style", "display: none;");
+ document.getElementById("reward1").attr("style", "display: none;");
+ document.getElementById("rewardToday1").attr("style", "display: none;");
+ document.getElementById("driverAudit1").attr("style", "display: none;");
+ document.getElementById("carAudit1").attr("style", "display: none;");
+
+ Element invite1_user = document.getElementById("invite1_user");
+ invite1_user.text("Hello " + driver.getName() + "，");
+ 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").attr("style", "display: none;");
+ document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("user2").attr("style", "display: none;");
+ document.getElementById("settle2").attr("style", "display: none;");
+ document.getElementById("pass2").attr("style", "display: none;");
+ document.getElementById("email2").attr("style", "display: none;");
+ document.getElementById("bill2").attr("style", "display: none;");
+ document.getElementById("reward2").attr("style", "display: none;");
+ document.getElementById("rewardToday2").attr("style", "display: none;");
+ document.getElementById("driverAudit2").attr("style", "display: none;");
+ document.getElementById("carAudit2").attr("style", "display: none;");
+
+ Element invite2_user = document.getElementById("invite2_user");
+ invite2_user.text("Bonjour " + driver.getName() + "，");
+ Element invite2_content = document.getElementById("invite2_content");
+ invite2_content.text("Vous avez invité avec succès un conducteur à s’inscrire à i-go pour recevoir une récompense GHS " + bigDecimal.doubleValue() + ". Veuillez vérifier");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "邀请奖励" : language == 2 ? "invitation bonus" : "prime d'invitation", document.html());
+ }
+
}
if(type == 1){//用户分享
UserInfo userInfo = userInfoMapper.selectById(uid);
@@ -280,7 +381,7 @@
userCouponRecordMapper.insert(userCouponRecord);
}
}
- }*/
+ }
}
return result;
}
@@ -309,7 +410,7 @@
driverMapper.updateById(driver1);
LoginWarpper loginWarpper = new LoginWarpper();
loginWarpper.setId(driver1.getId());
- return ResultUtil.error("电话号码已使用", loginWarpper);
+ return ResultUtil.success(loginWarpper);
}
@@ -317,7 +418,7 @@
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);
@@ -362,7 +463,7 @@
* @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.setSex(registeredWarpper.getSex());
@@ -392,11 +493,11 @@
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());
@@ -404,7 +505,7 @@
now.setTime(new Date());
driver.setDriverAge(now.get(Calendar.YEAR) - calendar.get(Calendar.YEAR));
driver.setGetDriverLicenseDate(registeredWarpper.getGetDriverLicenseDate());
- driver.setDriveCardImgUrl1(registeredWarpper.getDriveCardImgUrl1());
+ driver.setDriveCardImgUrl1(registeredWarpper.getDriveCardImgUrl());
driver.setDriveCardImgUrl2(registeredWarpper.getDriveCardImgUrl2());
driver.setEmail(registeredWarpper.getEmail());
@@ -430,6 +531,60 @@
}
}
+ if(ToolUtil.isNotEmpty(driver.getEmail())){
+ String path1 = templatePath + "index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if(1 == language){
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite").attr("style", "display: none;");
+ document1.getElementById("user").attr("style", "display: none;");
+ document1.getElementById("pass").attr("style", "display: none;");
+ document1.getElementById("email").attr("style", "display: none;");
+ document1.getElementById("bill").attr("style", "display: none;");
+ document1.getElementById("reward").attr("style", "display: none;");
+ document1.getElementById("rewardToday").attr("style", "display: none;");
+ document1.getElementById("driverAudit").attr("style", "display: none;");
+ document1.getElementById("carAudit").attr("style", "display: none;");
+
+ Element settle_user = document1.getElementById("settle_user");
+ settle_user.text("您好 " + driver.getName() + "，");
+ }
+ if(2 == language){
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite1").attr("style", "display: none;");
+ document1.getElementById("user1").attr("style", "display: none;");
+ document1.getElementById("pass1").attr("style", "display: none;");
+ document1.getElementById("email1").attr("style", "display: none;");
+ document1.getElementById("bill1").attr("style", "display: none;");
+ document1.getElementById("reward1").attr("style", "display: none;");
+ document1.getElementById("rewardToday1").attr("style", "display: none;");
+ document1.getElementById("driverAudit1").attr("style", "display: none;");
+ document1.getElementById("carAudit1").attr("style", "display: none;");
+
+ Element settle1_user = document1.getElementById("settle1_user");
+ settle1_user.text("Hello " + driver.getName() + "，");
+ }
+ if(3 == language){
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("invite2").attr("style", "display: none;");
+ document1.getElementById("user2").attr("style", "display: none;");
+ document1.getElementById("pass2").attr("style", "display: none;");
+ document1.getElementById("email2").attr("style", "display: none;");
+ document1.getElementById("bill2").attr("style", "display: none;");
+ document1.getElementById("reward2").attr("style", "display: none;");
+ document1.getElementById("rewardToday2").attr("style", "display: none;");
+ document1.getElementById("driverAudit2").attr("style", "display: none;");
+ document1.getElementById("carAudit2").attr("style", "display: none;");
+
+ Element settle2_user = document1.getElementById("settle2_user");
+ settle2_user.text("Bonjour " + driver.getName() + "，");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "注册成功" : language == 2 ? "registration success" : "succès de l'inscription", document1.html());
+ }
+
return ResultUtil.success();
}
@@ -443,7 +598,7 @@
* @throws Exception
*/
@Override
- public ResultUtil resetPassword(String phone, String code, String password) throws Exception {
+ public ResultUtil resetPassword(String phone, String code, String password, Integer language) throws Exception {
boolean b = this.checkCaptcha(phone, code);
if(!b){
return ResultUtil.error("验证码无效");
@@ -454,6 +609,60 @@
}
driver.setPassword(ShiroKit.md5(password, salt));
driverMapper.updateById(driver);
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())){
+ String path1 = templatePath + "index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if(1 == language){
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite").attr("style", "display: none;");
+ document1.getElementById("user").attr("style", "display: none;");
+ document1.getElementById("settle").attr("style", "display: none;");
+ document1.getElementById("email").attr("style", "display: none;");
+ document1.getElementById("bill").attr("style", "display: none;");
+ document1.getElementById("reward").attr("style", "display: none;");
+ document1.getElementById("rewardToday").attr("style", "display: none;");
+ document1.getElementById("driverAudit").attr("style", "display: none;");
+ document1.getElementById("carAudit").attr("style", "display: none;");
+
+ Element pass_user = document1.getElementById("pass_user");
+ pass_user.text("您好 " + driver.getName() + "，");
+ }
+ if(2 == language){
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite1").attr("style", "display: none;");
+ document1.getElementById("user1").attr("style", "display: none;");
+ document1.getElementById("settle1").attr("style", "display: none;");
+ document1.getElementById("email1").attr("style", "display: none;");
+ document1.getElementById("bill1").attr("style", "display: none;");
+ document1.getElementById("reward1").attr("style", "display: none;");
+ document1.getElementById("rewardToday1").attr("style", "display: none;");
+ document1.getElementById("driverAudit1").attr("style", "display: none;");
+ document1.getElementById("carAudit1").attr("style", "display: none;");
+
+ Element pass1_user = document1.getElementById("pass1_user");
+ pass1_user.text("Hello " + driver.getName() + "，");
+ }
+ if(3 == language){
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("invite2").attr("style", "display: none;");
+ document1.getElementById("user2").attr("style", "display: none;");
+ document1.getElementById("settle2").attr("style", "display: none;");
+ document1.getElementById("email2").attr("style", "display: none;");
+ document1.getElementById("bill2").attr("style", "display: none;");
+ document1.getElementById("reward2").attr("style", "display: none;");
+ document1.getElementById("rewardToday2").attr("style", "display: none;");
+ document1.getElementById("driverAudit2").attr("style", "display: none;");
+ document1.getElementById("carAudit2").attr("style", "display: none;");
+
+ Element pass2_user = document1.getElementById("pass2_user");
+ pass2_user.text("Bonjour " + driver.getName() + "，");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "重置密码" : language == 2 ? "reset Password" : "réinitialiser le mot de passe", document1.html());
+ }
smsrecordService.saveData(6, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
return ResultUtil.success();
@@ -502,9 +711,9 @@
if(null == driver){
return ResultUtil.error("账号未注册");
}
- /*if(driver.getAuthState() == 1){
+ if(driver.getAuthState() == 1){
return ResultUtil.error("账号正在审核中，请耐心等待");
- }*/
+ }
if(driver.getAuthState() == 3){
return ResultUtil.error("账号已被冻结，请联系管理员");
}
@@ -558,13 +767,16 @@
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) {
+ 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));
- for (OrderLogistics orderLogistic : orderLogistics) {
- pushUtil.pushOfflinePayment(2, orderLogistic.getDriverId(), orderLogistic.getId(), orderLogistic.getType());
+ if(orderLogistics.size() > 0){
+ OrderLogistics orderLogistics1 = orderLogistics.get(0);
+ pushUtil.pushOfflinePayment(2, orderLogistics1.getDriverId(), orderLogistics1.getId(), orderLogistics1.getType());
}
}
}).start();
@@ -617,15 +829,6 @@
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){
@@ -661,15 +864,6 @@
driverWork.setType(type);
driverWorkMapper.insert(driverWork);
driver.setState(2);
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){ //上传数据
- pushMinistryOfTransportUtil.operateLogin(uid);
- }
- }
- }).start();
}
this.updateById(driver);
return ResultUtil.success();
@@ -700,15 +894,6 @@
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){
@@ -746,16 +931,6 @@
driverOrdersMapper.insert(driverOrders);
}
}
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){
- //上传数据
- pushMinistryOfTransportUtil.operateLogin(uid);
- }
- }
- }).start();
}
this.updateById(driver);
return ResultUtil.success();
@@ -808,7 +983,7 @@
baseWarpper.setName("跨城出行");
break;
case 4:
- baseWarpper.setName("同城小件物流");
+ baseWarpper.setName("市内小件物流");
break;
case 5:
baseWarpper.setName("跨城小件物流");
@@ -902,10 +1077,63 @@
* @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 + "index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if(1 == language){
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite").attr("style", "display: none;");
+ document1.getElementById("user").attr("style", "display: none;");
+ document1.getElementById("settle").attr("style", "display: none;");
+ document1.getElementById("email").attr("style", "display: none;");
+ document1.getElementById("bill").attr("style", "display: none;");
+ document1.getElementById("reward").attr("style", "display: none;");
+ document1.getElementById("rewardToday").attr("style", "display: none;");
+ document1.getElementById("driverAudit").attr("style", "display: none;");
+ document1.getElementById("carAudit").attr("style", "display: none;");
+
+ Element pass_user = document1.getElementById("pass_user");
+ pass_user.text("您好 " + driver.getName() + "，");
+ }
+ if(2 == language){
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite1").attr("style", "display: none;");
+ document1.getElementById("user1").attr("style", "display: none;");
+ document1.getElementById("settle1").attr("style", "display: none;");
+ document1.getElementById("email1").attr("style", "display: none;");
+ document1.getElementById("bill1").attr("style", "display: none;");
+ document1.getElementById("reward1").attr("style", "display: none;");
+ document1.getElementById("rewardToday1").attr("style", "display: none;");
+ document1.getElementById("driverAudit1").attr("style", "display: none;");
+ document1.getElementById("carAudit1").attr("style", "display: none;");
+
+ Element pass1_user = document1.getElementById("pass1_user");
+ pass1_user.text("Hello " + driver.getName() + "，");
+ }
+ if(2 == language){
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("invite2").attr("style", "display: none;");
+ document1.getElementById("user2").attr("style", "display: none;");
+ document1.getElementById("settle2").attr("style", "display: none;");
+ document1.getElementById("email2").attr("style", "display: none;");
+ document1.getElementById("bill2").attr("style", "display: none;");
+ document1.getElementById("reward2").attr("style", "display: none;");
+ document1.getElementById("rewardToday2").attr("style", "display: none;");
+ document1.getElementById("driverAudit2").attr("style", "display: none;");
+ document1.getElementById("carAudit2").attr("style", "display: none;");
+
+ Element pass2_user = document1.getElementById("pass2_user");
+ pass2_user.text("Bonjour " + driver.getName() + "，");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "重置密码" : language == 2 ? "reset Password" : "réinitialiser le mot de passe", document1.html());
+ }
}
@@ -921,6 +1149,16 @@
Driver driver = this.selectById(uid);
if(driver.getState() == 3){
return ResultUtil.error("还在服务中，不能更换");
+ }
+ Car car = carService.selectById(carId);
+ if(null == car){
+ return ResultUtil.error("车辆无效");
+ }
+ if(car.getAuthState() == 1){
+ return ResultUtil.error("车辆正在审核中");
+ }
+ if(car.getAuthState() == 3){
+ return ResultUtil.error("车辆已冻结");
}
boolean idle = carService.idle(carId);
if(!idle){
@@ -1120,6 +1358,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){
//企业下的所有司机
@@ -1137,6 +1376,72 @@
driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
driverActivityHistory.setInsertTime(new Date());
driverActivityHistoryMapper.insert(driverActivityHistory);
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())) {
+ String path1 = templatePath + "index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if (1 == language) {
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite").attr("style", "display: none;");
+ document1.getElementById("user").attr("style", "display: none;");
+ document1.getElementById("settle").attr("style", "display: none;");
+ document1.getElementById("pass").attr("style", "display: none;");
+ document1.getElementById("email").attr("style", "display: none;");
+ document1.getElementById("bill").attr("style", "display: none;");
+ document1.getElementById("reward").attr("style", "display: none;");
+ document1.getElementById("driverAudit").attr("style", "display: none;");
+ document1.getElementById("carAudit").attr("style", "display: none;");
+
+ Element rewardToday_user = document1.getElementById("rewardToday_user");
+ rewardToday_user.text("您好 " + driver.getName() + "，");
+ Element rewardToday_award = document1.getElementById("rewardToday_award");
+ rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
+ Element rewardToday_content = document1.getElementById("rewardToday_content");
+ rewardToday_content.text("邀请司机注册即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
+ }
+ if (2 == language) {
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite1").attr("style", "display: none;");
+ document1.getElementById("user1").attr("style", "display: none;");
+ document1.getElementById("settle1").attr("style", "display: none;");
+ document1.getElementById("pass1").attr("style", "display: none;");
+ document1.getElementById("email1").attr("style", "display: none;");
+ document1.getElementById("bill1").attr("style", "display: none;");
+ document1.getElementById("reward1").attr("style", "display: none;");
+ document1.getElementById("driverAudit1").attr("style", "display: none;");
+ document1.getElementById("carAudit1").attr("style", "display: none;");
+
+ Element rewardToday1_user = document1.getElementById("rewardToday1_user");
+ rewardToday1_user.text("Hello " + driver.getName() + "，");
+ Element rewardToday1_award = document1.getElementById("rewardToday1_award");
+ rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
+ Element rewardToday1_content = document1.getElementById("rewardToday1_content");
+ rewardToday1_content.text("Invite drivers to register and get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
+ }
+ if (3 == language) {
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite2").attr("style", "display: none;");
+ document1.getElementById("user2").attr("style", "display: none;");
+ document1.getElementById("settle2").attr("style", "display: none;");
+ document1.getElementById("pass2").attr("style", "display: none;");
+ document1.getElementById("email2").attr("style", "display: none;");
+ document1.getElementById("bill2").attr("style", "display: none;");
+ document1.getElementById("reward2").attr("style", "display: none;");
+ document1.getElementById("driverAudit2").attr("style", "display: none;");
+ document1.getElementById("carAudit2").attr("style", "display: none;");
+
+ Element rewardToday2_user = document1.getElementById("rewardToday2_user");
+ rewardToday2_user.text("Bonjour " + driver.getName() + "，");
+ Element rewardToday2_award = document1.getElementById("rewardToday2_award");
+ rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
+ Element rewardToday2_content = document1.getElementById("rewardToday2_content");
+ rewardToday2_content.text("Invitez les conducteurs à s’inscrire et à recevoir des récompenses. Notez que cet événement est limité dans le temps, veuillez consulter la plateforme I-GO pour plus de détails.");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui", document1.html());
+ }
}
}
//邀请用户注册
@@ -1152,11 +1457,78 @@
driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
driverActivityHistory.setInsertTime(new Date());
driverActivityHistoryMapper.insert(driverActivityHistory);
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())) {
+ String path1 = templatePath + "index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if (1 == language) {
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite").attr("style", "display: none;");
+ document1.getElementById("user").attr("style", "display: none;");
+ document1.getElementById("settle").attr("style", "display: none;");
+ document1.getElementById("pass").attr("style", "display: none;");
+ document1.getElementById("email").attr("style", "display: none;");
+ document1.getElementById("bill").attr("style", "display: none;");
+ document1.getElementById("reward").attr("style", "display: none;");
+ document1.getElementById("driverAudit").attr("style", "display: none;");
+ document1.getElementById("carAudit").attr("style", "display: none;");
+
+ Element rewardToday_user = document1.getElementById("rewardToday_user");
+ rewardToday_user.text("您好 " + driver.getName() + "，");
+ Element rewardToday_award = document1.getElementById("rewardToday_award");
+ rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
+ Element rewardToday_content = document1.getElementById("rewardToday_content");
+ rewardToday_content.text("邀请用户注册即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
+ }
+ if (2 == language) {
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite1").attr("style", "display: none;");
+ document1.getElementById("user1").attr("style", "display: none;");
+ document1.getElementById("settle1").attr("style", "display: none;");
+ document1.getElementById("pass1").attr("style", "display: none;");
+ document1.getElementById("email1").attr("style", "display: none;");
+ document1.getElementById("bill1").attr("style", "display: none;");
+ document1.getElementById("reward1").attr("style", "display: none;");
+ document1.getElementById("driverAudit1").attr("style", "display: none;");
+ document1.getElementById("carAudit1").attr("style", "display: none;");
+
+ Element rewardToday1_user = document1.getElementById("rewardToday1_user");
+ rewardToday1_user.text("Hello " + driver.getName() + "，");
+ Element rewardToday1_award = document1.getElementById("rewardToday1_award");
+ rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
+ Element rewardToday1_content = document1.getElementById("rewardToday1_content");
+ rewardToday1_content.text("Invite users to register and get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
+ }
+ if (3 == language) {
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("invite2").attr("style", "display: none;");
+ document1.getElementById("user2").attr("style", "display: none;");
+ document1.getElementById("settle2").attr("style", "display: none;");
+ document1.getElementById("pass2").attr("style", "display: none;");
+ document1.getElementById("email2").attr("style", "display: none;");
+ document1.getElementById("bill2").attr("style", "display: none;");
+ document1.getElementById("reward2").attr("style", "display: none;");
+ document1.getElementById("driverAudit2").attr("style", "display: none;");
+ document1.getElementById("carAudit2").attr("style", "display: none;");
+
+ Element rewardToday2_user = document1.getElementById("rewardToday2_user");
+ rewardToday2_user.text("Bonjour " + driver.getName() + "，");
+ Element rewardToday2_award = document1.getElementById("rewardToday2_award");
+ rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
+ Element rewardToday2_content = document1.getElementById("rewardToday2_content");
+ rewardToday2_content.text("Invitez les conducteurs à s’inscrire et à recevoir des récompenses. Notez que cet événement est limité dans le temps, veuillez consulter la plateforme I-GO pour plus de détails.");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui", document1.html());
+ }
}
}
//累计在线
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"))));
@@ -1167,11 +1539,78 @@
driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
driverActivityHistory.setInsertTime(new Date());
driverActivityHistoryMapper.insert(driverActivityHistory);
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())) {
+ String path1 = templatePath + "index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if (1 == language) {
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite").attr("style", "display: none;");
+ document1.getElementById("user").attr("style", "display: none;");
+ document1.getElementById("settle").attr("style", "display: none;");
+ document1.getElementById("pass").attr("style", "display: none;");
+ document1.getElementById("email").attr("style", "display: none;");
+ document1.getElementById("bill").attr("style", "display: none;");
+ document1.getElementById("reward").attr("style", "display: none;");
+ document1.getElementById("driverAudit").attr("style", "display: none;");
+ document1.getElementById("carAudit").attr("style", "display: none;");
+
+ Element rewardToday_user = document1.getElementById("rewardToday_user");
+ rewardToday_user.text("您好 " + driver.getName() + "，");
+ Element rewardToday_award = document1.getElementById("rewardToday_award");
+ rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
+ Element rewardToday_content = document1.getElementById("rewardToday_content");
+ rewardToday_content.text("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
+ }
+ if (2 == language) {
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite1").attr("style", "display: none;");
+ document1.getElementById("user1").attr("style", "display: none;");
+ document1.getElementById("settle1").attr("style", "display: none;");
+ document1.getElementById("pass1").attr("style", "display: none;");
+ document1.getElementById("email1").attr("style", "display: none;");
+ document1.getElementById("bill1").attr("style", "display: none;");
+ document1.getElementById("reward1").attr("style", "display: none;");
+ document1.getElementById("driverAudit1").attr("style", "display: none;");
+ document1.getElementById("carAudit1").attr("style", "display: none;");
+
+ Element rewardToday1_user = document1.getElementById("rewardToday1_user");
+ rewardToday1_user.text("Hello " + driver.getName() + "，");
+ Element rewardToday1_award = document1.getElementById("rewardToday1_award");
+ rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
+ Element rewardToday1_content = document1.getElementById("rewardToday1_content");
+ rewardToday1_content.text("Accumulated online " + driverActivityOnline.getOnline() + " hours today to get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
+ }
+ if (3 == language) {
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("invite2").attr("style", "display: none;");
+ document1.getElementById("user2").attr("style", "display: none;");
+ document1.getElementById("settle2").attr("style", "display: none;");
+ document1.getElementById("pass2").attr("style", "display: none;");
+ document1.getElementById("email2").attr("style", "display: none;");
+ document1.getElementById("bill2").attr("style", "display: none;");
+ document1.getElementById("reward2").attr("style", "display: none;");
+ document1.getElementById("driverAudit2").attr("style", "display: none;");
+ document1.getElementById("carAudit2").attr("style", "display: none;");
+
+ Element rewardToday2_user = document1.getElementById("rewardToday2_user");
+ rewardToday2_user.text("Bonjour " + driver.getName() + "，");
+ Element rewardToday2_award = document1.getElementById("rewardToday2_award");
+ rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
+ Element rewardToday2_content = document1.getElementById("rewardToday2_content");
+ rewardToday2_content.text("Accumulé en ligne " + driverActivityOnline.getOnline() + " heures aujourd’hui pour obtenir des récompenses d’événement. Notez que cet événement est limité dans le temps, veuillez consulter la plateforme I-GO pour plus de détails.");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui", document1.html());
+ }
}
}
//订单量
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"))));
@@ -1182,6 +1621,72 @@
driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
driverActivityHistory.setInsertTime(new Date());
driverActivityHistoryMapper.insert(driverActivityHistory);
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())) {
+ String path1 = templatePath + "index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if (1 == language) {
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite").attr("style", "display: none;");
+ document1.getElementById("user").attr("style", "display: none;");
+ document1.getElementById("settle").attr("style", "display: none;");
+ document1.getElementById("pass").attr("style", "display: none;");
+ document1.getElementById("email").attr("style", "display: none;");
+ document1.getElementById("bill").attr("style", "display: none;");
+ document1.getElementById("reward").attr("style", "display: none;");
+ document1.getElementById("driverAudit").attr("style", "display: none;");
+ document1.getElementById("carAudit").attr("style", "display: none;");
+
+ Element rewardToday_user = document1.getElementById("rewardToday_user");
+ rewardToday_user.text("您好 " + driver.getName() + "，");
+ Element rewardToday_award = document1.getElementById("rewardToday_award");
+ rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());
+ Element rewardToday_content = document1.getElementById("rewardToday_content");
+ rewardToday_content.text("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");
+ }
+ if (2 == language) {
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite1").attr("style", "display: none;");
+ document1.getElementById("user1").attr("style", "display: none;");
+ document1.getElementById("settle1").attr("style", "display: none;");
+ document1.getElementById("pass1").attr("style", "display: none;");
+ document1.getElementById("email1").attr("style", "display: none;");
+ document1.getElementById("bill1").attr("style", "display: none;");
+ document1.getElementById("reward1").attr("style", "display: none;");
+ document1.getElementById("driverAudit1").attr("style", "display: none;");
+ document1.getElementById("carAudit1").attr("style", "display: none;");
+
+ Element rewardToday1_user = document1.getElementById("rewardToday1_user");
+ rewardToday1_user.text("Hello " + driver.getName() + "，");
+ Element rewardToday1_award = document1.getElementById("rewardToday1_award");
+ rewardToday1_award.text("GHS " + driverActivityHistory.getMoney() + " BONUS");
+ Element rewardToday1_content = document1.getElementById("rewardToday1_content");
+ rewardToday1_content.text("Complete " + driverActivityOrder.getOrderNum() + " orders in total today to get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
+ }
+ if (3 == language) {
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("invite2").attr("style", "display: none;");
+ document1.getElementById("user2").attr("style", "display: none;");
+ document1.getElementById("settle2").attr("style", "display: none;");
+ document1.getElementById("pass2").attr("style", "display: none;");
+ document1.getElementById("email2").attr("style", "display: none;");
+ document1.getElementById("bill2").attr("style", "display: none;");
+ document1.getElementById("reward2").attr("style", "display: none;");
+ document1.getElementById("driverAudit2").attr("style", "display: none;");
+ document1.getElementById("carAudit2").attr("style", "display: none;");
+
+ Element rewardToday2_user = document1.getElementById("rewardToday2_user");
+ rewardToday2_user.text("Bonjour " + driver.getName() + "，");
+ Element rewardToday2_award = document1.getElementById("rewardToday2_award");
+ rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
+ Element rewardToday2_content = document1.getElementById("rewardToday2_content");
+ rewardToday2_content.text("Effectuez " + driverActivityOrder.getOrderNum() + " commandes au total aujourd’hui pour obtenir des récompenses d’événement. Notez que cet événement est limité dans le temps, veuillez consulter la plateforme I-GO pour plus de détails.");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "今日活动" : language == 2 ? "today's activity" : "l'événement d'aujourd'hui", document1.html());
+ }
}
}
}
@@ -1195,13 +1700,16 @@
@Override
public void taskMinute() throws Exception {
Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
+ Integer language = 1;
//在线时长
List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(null, 3, 1, date.get("startTime"), date.get("endTime"));
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
for(DriverActivityHistory dah : list){
DriverActivityOnline dao = driverActivityOnlineMapper.selectById(dah.getActivityId());
- List<DriverWork> query = driverWorkMapper.query(dao.getType(), dao.getOnline());//满足活动条件的数据
- for(DriverWork dw : query){
- if(dah.getDriverId().compareTo(dw.getDriverId()) == 0){
+ Long duration = Long.valueOf(dao.getOnline() * 60 * 60 * 1000);
+ List<DriverOnline> driverOnlines = driverOnlineMapper.queryList(sdf.format(new Date()), duration);
+ for (DriverOnline driverOnline : driverOnlines) {
+ if(dah.getDriverId().compareTo(driverOnline.getDriverId()) == 0){
dah.setCarryOut(2);//完成状态
driverActivityHistoryMapper.updateById(dah);
//修改余额
@@ -1215,7 +1723,68 @@
this.updateById(driver);
//添加收入记录
- incomeService.saveData(2, dw.getDriverId(), 1, dao.getId(), null, dah.getMoney());
+ incomeService.saveData(2, driverOnline.getDriverId(), 1, dao.getId(), null, dah.getMoney());
+
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())) {
+ String path1 = templatePath + "index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if (1 == language) {
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite").attr("style", "display: none;");
+ document1.getElementById("user").attr("style", "display: none;");
+ document1.getElementById("settle").attr("style", "display: none;");
+ document1.getElementById("pass").attr("style", "display: none;");
+ document1.getElementById("email").attr("style", "display: none;");
+ document1.getElementById("bill").attr("style", "display: none;");
+ document1.getElementById("rewardToday").attr("style", "display: none;");
+ document1.getElementById("driverAudit").attr("style", "display: none;");
+ document1.getElementById("carAudit").attr("style", "display: none;");
+
+ Element reward_user = document1.getElementById("reward_user");
+ reward_user.text("您好 " + driver.getName() + "，");
+ Element reward_content = document1.getElementById("reward_content");
+ reward_content.text("今日累计在线 " + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收");
+ }
+ if (2 == language) {
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite1").attr("style", "display: none;");
+ document1.getElementById("user1").attr("style", "display: none;");
+ document1.getElementById("settle1").attr("style", "display: none;");
+ document1.getElementById("pass1").attr("style", "display: none;");
+ document1.getElementById("email1").attr("style", "display: none;");
+ document1.getElementById("bill1").attr("style", "display: none;");
+ document1.getElementById("rewardToday1").attr("style", "display: none;");
+ document1.getElementById("driverAudit1").attr("style", "display: none;");
+ document1.getElementById("carAudit1").attr("style", "display: none;");
+
+ Element reward1_user = document1.getElementById("reward1_user");
+ reward1_user.text("Hello " + driver.getName() + "，");
+ Element reward1_content = document1.getElementById("reward1_content");
+ reward1_content.text("accumulated online for " + dao.getOnline() + " hour today, get reward GHS" + dah.getMoney() + ", please check");
+ }
+ if (3 == language) {
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("invite2").attr("style", "display: none;");
+ document1.getElementById("user2").attr("style", "display: none;");
+ document1.getElementById("settle2").attr("style", "display: none;");
+ document1.getElementById("pass2").attr("style", "display: none;");
+ document1.getElementById("email2").attr("style", "display: none;");
+ document1.getElementById("bill2").attr("style", "display: none;");
+ document1.getElementById("rewardToday2").attr("style", "display: none;");
+ document1.getElementById("driverAudit2").attr("style", "display: none;");
+ document1.getElementById("carAudit2").attr("style", "display: none;");
+
+ Element reward2_user = document1.getElementById("reward2_user");
+ reward2_user.text("Bonjour " + driver.getName() + "，");
+ Element reward2_content = document1.getElementById("reward2_content");
+ reward2_content.text("Accumulé en ligne pendant " + dao.getOnline() + " heure aujourd’hui, obtenez la récompense GHS " + dah.getMoney() + ", s’il vous plaît vérifier");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "在线时长奖励" : language == 2 ? "Online Time Rewards" : "Récompenses de temps en ligne", document1.html());
+ }
}
}
}
@@ -1240,6 +1809,66 @@
//添加收入记录
incomeService.saveData(2, dah.getDriverId(), 1, dao.getId(), null, dah.getMoney());
+
+ if(ToolUtil.isNotEmpty(driver.getEmail())) {
+ String path1 = templatePath + "index.html";
+ Document document1 = Jsoup.parse(new File(path1), "UTF-8");
+ if (1 == language) {
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite").attr("style", "display: none;");
+ document1.getElementById("user").attr("style", "display: none;");
+ document1.getElementById("settle").attr("style", "display: none;");
+ document1.getElementById("pass").attr("style", "display: none;");
+ document1.getElementById("email").attr("style", "display: none;");
+ document1.getElementById("bill").attr("style", "display: none;");
+ document1.getElementById("rewardToday").attr("style", "display: none;");
+ document1.getElementById("driverAudit").attr("style", "display: none;");
+ document1.getElementById("carAudit").attr("style", "display: none;");
+
+ Element reward_user = document1.getElementById("reward_user");
+ reward_user.text("您好 " + driver.getName() + "，");
+ Element reward_content = document1.getElementById("reward_content");
+ reward_content.text("今日累计接单 " + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收");
+ }
+ if (2 == language) {
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("french").attr("style", "display: none;");
+ document1.getElementById("invite1").attr("style", "display: none;");
+ document1.getElementById("user1").attr("style", "display: none;");
+ document1.getElementById("settle1").attr("style", "display: none;");
+ document1.getElementById("pass1").attr("style", "display: none;");
+ document1.getElementById("email1").attr("style", "display: none;");
+ document1.getElementById("bill1").attr("style", "display: none;");
+ document1.getElementById("rewardToday1").attr("style", "display: none;");
+ document1.getElementById("driverAudit1").attr("style", "display: none;");
+ document1.getElementById("carAudit1").attr("style", "display: none;");
+
+ Element reward1_user = document1.getElementById("reward1_user");
+ reward1_user.text("Hello " + driver.getName() + "，");
+ Element reward1_content = document1.getElementById("reward1_content");
+ reward1_content.text("A total of " + dao.getOrderNum() + " orders have been received today, and the reward GHS" + dah.getMoney() + " will be awarded, please check");
+ }
+ if (3 == language) {
+ document1.getElementById("chinese").attr("style", "display: none;");
+ document1.getElementById("english").attr("style", "display: none;");
+ document1.getElementById("invite2").attr("style", "display: none;");
+ document1.getElementById("user2").attr("style", "display: none;");
+ document1.getElementById("settle2").attr("style", "display: none;");
+ document1.getElementById("pass2").attr("style", "display: none;");
+ document1.getElementById("email2").attr("style", "display: none;");
+ document1.getElementById("bill2").attr("style", "display: none;");
+ document1.getElementById("rewardToday2").attr("style", "display: none;");
+ document1.getElementById("driverAudit2").attr("style", "display: none;");
+ document1.getElementById("carAudit2").attr("style", "display: none;");
+
+ Element reward2_user = document1.getElementById("reward2_user");
+ reward2_user.text("Bonjour " + driver.getName() + "，");
+ Element reward2_content = document1.getElementById("reward2_content");
+ reward2_content.text("Un total de " + dao.getOrderNum() + " commandes ont été reçues aujourd’hui, et la récompense GHS " + dah.getMoney() + " sera décernée, s’il vous plaît vérifier");
+ }
+ EmailUtil.send(driver.getEmail(), language == 1 ? "累计接单奖励" : language == 2 ? "Cumulative Order Rewards" : "Récompenses de commande cumulées", document1.html());
+ }
}
}
}
--
Gitblit v1.7.1