From d9c4252c54adc1684de9b56ad810465945e442a8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 09 七月 2023 06:20:31 +0800
Subject: [PATCH] 更新支付相关功能及多语言
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 186 +++++++++++++++++++++++-----------------------
1 files changed, 92 insertions(+), 94 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 de77901..de5520d 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
@@ -172,7 +172,7 @@
//发送验证码短信
redisUtil.setStrValue(phone, authCode, 5 * 60);//设置五分钟过期
- SMSUtil.send_huawei_sms("b793ae3d41a049059197bfe92cf8bc83", "+233" + phone, "[\"" + authCode + "\"]");
+ SMSUtil.send_huawei_sms("b793ae3d41a049059197bfe92cf8bc83", "+" + phone, "[\"" + authCode + "\"]");
System.out.println(sms);
return ResultUtil.success();
}
@@ -277,8 +277,8 @@
* @throws Exception
*/
@Override
- 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);
+ public ResultUtil registeredDriver(String phoneOperator, String phone, String code, String password, Integer uid, Integer type, Integer userType, Integer language) throws Exception {
+ ResultUtil<LoginWarpper> result = this.registeredDriver(phoneOperator, phone, code, password,uid,type, language);
if(result.getCode() == 200 && null != uid){
if(type == 2){
Driver driver = driverMapper.selectById(uid);
@@ -312,7 +312,7 @@
document.getElementById("carAudit").attr("style", "display: none;");
Element invite_user = document.getElementById("invite_user");
- invite_user.text("您好 " + driver.getName() + "，");
+ invite_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element invite_content = document.getElementById("invite_content");
invite_content.text("您已成功邀请一位司机注册I-GO，获得奖励GHS " + bigDecimal.doubleValue() + "，请查收");
}
@@ -330,7 +330,7 @@
document.getElementById("carAudit1").attr("style", "display: none;");
Element invite1_user = document.getElementById("invite1_user");
- invite1_user.text("Hello " + driver.getName() + "，");
+ 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.");
}
@@ -348,7 +348,7 @@
document.getElementById("carAudit2").attr("style", "display: none;");
Element invite2_user = document.getElementById("invite2_user");
- invite2_user.text("Bonjour " + driver.getName() + "，");
+ 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");
}
@@ -398,10 +398,10 @@
* @throws Exception
*/
@Override
- public ResultUtil<LoginWarpper> registeredDriver(String phone, String code, String password,Integer uid,Integer uType) throws Exception {
+ 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" : "Code de vérification invalide");
}
Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据
@@ -423,6 +423,7 @@
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);
@@ -465,7 +466,8 @@
@Override
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());
@@ -474,7 +476,7 @@
String[] city = new String[]{city1.getEnglishName()};
Company query = companyCityService.query(city);
if(null == query){
- return ResultUtil.error("选择从业地暂未开通业务");
+ return ResultUtil.error(language == 1 ? "车牌号已经使用" : language == 2 ? "" : "选择从业地暂未开通业务");
}
if(null != query){
switch (query.getType()){
@@ -548,7 +550,7 @@
document1.getElementById("carAudit").attr("style", "display: none;");
Element settle_user = document1.getElementById("settle_user");
- settle_user.text("您好 " + driver.getName() + "，");
+ settle_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
if(2 == language){
document1.getElementById("chinese").attr("style", "display: none;");
@@ -564,7 +566,7 @@
document1.getElementById("carAudit1").attr("style", "display: none;");
Element settle1_user = document1.getElementById("settle1_user");
- settle1_user.text("Hello " + driver.getName() + "，");
+ settle1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
if(3 == language){
document1.getElementById("chinese").attr("style", "display: none;");
@@ -580,7 +582,7 @@
document1.getElementById("carAudit2").attr("style", "display: none;");
Element settle2_user = document1.getElementById("settle2_user");
- settle2_user.text("Bonjour " + driver.getName() + "，");
+ settle2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
EmailUtil.send(driver.getEmail(), language == 1 ? "注册成功" : language == 2 ? "registration success" : "succès de l'inscription", document1.html());
}
@@ -601,11 +603,11 @@
public ResultUtil resetPassword(String phone, String code, String password, Integer language) throws Exception {
boolean b = this.checkCaptcha(phone, code);
if(!b){
- return ResultUtil.error("验证码无效");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
}
Driver driver = driverMapper.queryByPhone(phone);
if(null == driver){
- return ResultUtil.error("电话号码未注册");
+ return ResultUtil.error(language == 1 ? "电话号码未注册" : language == 2 ? "The phone number is not registered" : "Numéro de téléphone non enregistré");
}
driver.setPassword(ShiroKit.md5(password, salt));
driverMapper.updateById(driver);
@@ -627,7 +629,7 @@
document1.getElementById("carAudit").attr("style", "display: none;");
Element pass_user = document1.getElementById("pass_user");
- pass_user.text("您好 " + driver.getName() + "，");
+ pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
if(2 == language){
document1.getElementById("chinese").attr("style", "display: none;");
@@ -643,7 +645,7 @@
document1.getElementById("carAudit1").attr("style", "display: none;");
Element pass1_user = document1.getElementById("pass1_user");
- pass1_user.text("Hello " + driver.getName() + "，");
+ pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
if(3 == language){
document1.getElementById("chinese").attr("style", "display: none;");
@@ -659,7 +661,7 @@
document1.getElementById("carAudit2").attr("style", "display: none;");
Element pass2_user = document1.getElementById("pass2_user");
- pass2_user.text("Bonjour " + driver.getName() + "，");
+ 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());
}
@@ -706,24 +708,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 not registered" : "Compte non enregistré");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error("账号正在审核中，请耐心等待");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error("账号已被冻结，请联系管理员");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
}
if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){
- return ResultUtil.error("密码错误");
+ return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
}
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");
}
//调用单点登录逻辑
@@ -734,11 +736,6 @@
loginWarpper.setId(driver.getId());
loginWarpper.setToken(token);
loginWarpper.setAppid(UUIDUtil.getRandomCode());
-
- //创建高德猎鹰的终端数据
- String tid = gdFalconUtil.createTerminal(phone);
- loginWarpper.setServerId(gdFalconUtil.getServerId());
- loginWarpper.setTerminalId(tid);
if(driver.getCompanyId()==null){
loginWarpper.setJumpCode("100000");
}else{
@@ -816,14 +813,14 @@
* @throws Exception
*/
@Override
- public ResultUtil work(Integer uid, String type) throws Exception {
+ public ResultUtil work(Integer uid, String type, Integer language) throws Exception {
DriverWork driverWork = driverWorkMapper.queryNewWork(uid, null, 1);
Driver driver = this.selectById(uid);
if(null != driverWork){//作下班操作
//检测是否有未完成的订单
List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid);
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);
@@ -842,20 +839,20 @@
}
//判断是否存在审核中的资料
if(driver.getAuthState()==1){
- return ResultUtil.error("资料审核中，不能出车");
+ return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data review, can't get out of the car" : "Données en cours de vérification, pas de voiture disponible");
}
if(driver.getAuthState()==4){
- return ResultUtil.error("请完善资料后再出车");
+ return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
}
Car car = carService.selectById(driver.getCarId());
if(car==null){
- return ResultUtil.error("请完善资料后再出车");
+ return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
}
if(car.getAuthState()==1){
- return ResultUtil.error("资料审核中，不能出车");
+ return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data review, can't get out of the car" : "Données en cours de vérification, pas de voiture disponible");
}
if(car.getAuthState()==4){
- return ResultUtil.error("请完善资料后再出车");
+ return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
}
driverWork = new DriverWork();
driverWork.setState(1);
@@ -873,12 +870,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");
}
}
@@ -888,7 +885,7 @@
//检测是否有未完成的订单
List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid);
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);
@@ -920,7 +917,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));
@@ -1032,17 +1029,18 @@
* @throws Exception
*/
@Override
- public ResultUtil updatePhone(String phone, String code, Integer uid) throws Exception {
+ public ResultUtil updatePhone(String phoneOperator, String phone, String code, Integer uid, Integer language) throws Exception {
Driver driver = driverMapper.queryByPhone(phone);
if(null != driver){
- return ResultUtil.error("电话号码已被注册");
+ return ResultUtil.error(language == 1 ? "电话号码已被注册" : language == 2 ? "he phone number is registered" : "Le numéro de téléphone a été enregistré");
}
boolean b = this.checkCaptcha(phone, code);
if(!b){
- return ResultUtil.error("验证码无效");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
}
Driver driver1 = this.selectById(uid);
driver1.setAccount(phone);
+ driver1.setPhoneOperator(phoneOperator);
driver1.setPhone(phone);
this.updateById(driver1);
@@ -1098,7 +1096,7 @@
document1.getElementById("carAudit").attr("style", "display: none;");
Element pass_user = document1.getElementById("pass_user");
- pass_user.text("您好 " + driver.getName() + "，");
+ pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
if(2 == language){
document1.getElementById("chinese").attr("style", "display: none;");
@@ -1114,7 +1112,7 @@
document1.getElementById("carAudit1").attr("style", "display: none;");
Element pass1_user = document1.getElementById("pass1_user");
- pass1_user.text("Hello " + driver.getName() + "，");
+ pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
if(2 == language){
document1.getElementById("chinese").attr("style", "display: none;");
@@ -1130,7 +1128,7 @@
document1.getElementById("carAudit2").attr("style", "display: none;");
Element pass2_user = document1.getElementById("pass2_user");
- pass2_user.text("Bonjour " + driver.getName() + "，");
+ 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());
}
@@ -1145,24 +1143,24 @@
* @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 ? "It is still in service and cannot be replaced" : "Toujours en service, non échangeable");
}
Car car = carService.selectById(carId);
if(null == car){
- return ResultUtil.error("车辆无效");
+ return ResultUtil.error(language == 1 ? "车辆无效" : language == 2 ? "Invalid vehicle" : "Véhicule non valide");
}
if(car.getAuthState() == 1){
- return ResultUtil.error("车辆正在审核中");
+ return ResultUtil.error(language == 1 ? "车辆正在审核中" : language == 2 ? "The vehicle is under review" : "Véhicule en révision");
}
if(car.getAuthState() == 3){
- return ResultUtil.error("车辆已冻结");
+ return ResultUtil.error(language == 1 ? "车辆已冻结" : language == 2 ? "Vehicle frozen" : "Le véhicule a été gelé");
}
boolean idle = carService.idle(carId);
if(!idle){
- return ResultUtil.error("车辆已被绑定了");
+ return ResultUtil.error(language == 1 ? "车辆已被绑定了" : language == 2 ? "The vehicle has been bound" : "e véhicule a été lié");
}
driver.setCarId(carId);
this.updateById(driver);
@@ -1394,7 +1392,7 @@
document1.getElementById("carAudit").attr("style", "display: none;");
Element rewardToday_user = document1.getElementById("rewardToday_user");
- rewardToday_user.text("您好 " + driver.getName() + "，");
+ 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");
@@ -1414,7 +1412,7 @@
document1.getElementById("carAudit1").attr("style", "display: none;");
Element rewardToday1_user = document1.getElementById("rewardToday1_user");
- rewardToday1_user.text("Hello " + driver.getName() + "，");
+ 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");
@@ -1434,7 +1432,7 @@
document1.getElementById("carAudit2").attr("style", "display: none;");
Element rewardToday2_user = document1.getElementById("rewardToday2_user");
- rewardToday2_user.text("Bonjour " + driver.getName() + "，");
+ rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
@@ -1475,7 +1473,7 @@
document1.getElementById("carAudit").attr("style", "display: none;");
Element rewardToday_user = document1.getElementById("rewardToday_user");
- rewardToday_user.text("您好 " + driver.getName() + "，");
+ 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");
@@ -1495,7 +1493,7 @@
document1.getElementById("carAudit1").attr("style", "display: none;");
Element rewardToday1_user = document1.getElementById("rewardToday1_user");
- rewardToday1_user.text("Hello " + driver.getName() + "，");
+ 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");
@@ -1515,7 +1513,7 @@
document1.getElementById("carAudit2").attr("style", "display: none;");
Element rewardToday2_user = document1.getElementById("rewardToday2_user");
- rewardToday2_user.text("Bonjour " + driver.getName() + "，");
+ rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
@@ -1557,7 +1555,7 @@
document1.getElementById("carAudit").attr("style", "display: none;");
Element rewardToday_user = document1.getElementById("rewardToday_user");
- rewardToday_user.text("您好 " + driver.getName() + "，");
+ 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");
@@ -1577,7 +1575,7 @@
document1.getElementById("carAudit1").attr("style", "display: none;");
Element rewardToday1_user = document1.getElementById("rewardToday1_user");
- rewardToday1_user.text("Hello " + driver.getName() + "，");
+ 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");
@@ -1597,7 +1595,7 @@
document1.getElementById("carAudit2").attr("style", "display: none;");
Element rewardToday2_user = document1.getElementById("rewardToday2_user");
- rewardToday2_user.text("Bonjour " + driver.getName() + "，");
+ rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
@@ -1639,7 +1637,7 @@
document1.getElementById("carAudit").attr("style", "display: none;");
Element rewardToday_user = document1.getElementById("rewardToday_user");
- rewardToday_user.text("您好 " + driver.getName() + "，");
+ 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");
@@ -1659,7 +1657,7 @@
document1.getElementById("carAudit1").attr("style", "display: none;");
Element rewardToday1_user = document1.getElementById("rewardToday1_user");
- rewardToday1_user.text("Hello " + driver.getName() + "，");
+ 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");
@@ -1679,7 +1677,7 @@
document1.getElementById("carAudit2").attr("style", "display: none;");
Element rewardToday2_user = document1.getElementById("rewardToday2_user");
- rewardToday2_user.text("Bonjour " + driver.getName() + "，");
+ rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element rewardToday2_award = document1.getElementById("rewardToday2_award");
rewardToday2_award.text("Bonus GHS " + driverActivityHistory.getMoney());
Element rewardToday2_content = document1.getElementById("rewardToday2_content");
@@ -1743,7 +1741,7 @@
document1.getElementById("carAudit").attr("style", "display: none;");
Element reward_user = document1.getElementById("reward_user");
- reward_user.text("您好 " + driver.getName() + "，");
+ reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward_content = document1.getElementById("reward_content");
reward_content.text("今日累计在线 " + dao.getOnline() + "小时，获得奖励GHS" + dah.getMoney() + "，请查收");
}
@@ -1761,7 +1759,7 @@
document1.getElementById("carAudit1").attr("style", "display: none;");
Element reward1_user = document1.getElementById("reward1_user");
- reward1_user.text("Hello " + driver.getName() + "，");
+ reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward1_content = document1.getElementById("reward1_content");
reward1_content.text("accumulated online for " + dao.getOnline() + " hour today, get reward GHS" + dah.getMoney() + ", please check");
}
@@ -1779,7 +1777,7 @@
document1.getElementById("carAudit2").attr("style", "display: none;");
Element reward2_user = document1.getElementById("reward2_user");
- reward2_user.text("Bonjour " + driver.getName() + "，");
+ reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward2_content = document1.getElementById("reward2_content");
reward2_content.text("Accumulé en ligne pendant " + dao.getOnline() + " heure aujourd’hui, obtenez la récompense GHS " + dah.getMoney() + ", s’il vous plaît vérifier");
}
@@ -1827,7 +1825,7 @@
document1.getElementById("carAudit").attr("style", "display: none;");
Element reward_user = document1.getElementById("reward_user");
- reward_user.text("您好 " + driver.getName() + "，");
+ reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward_content = document1.getElementById("reward_content");
reward_content.text("今日累计接单 " + dao.getOrderNum() + "单，获得奖励GHS" + dah.getMoney() + "，请查收");
}
@@ -1845,7 +1843,7 @@
document1.getElementById("carAudit1").attr("style", "display: none;");
Element reward1_user = document1.getElementById("reward1_user");
- reward1_user.text("Hello " + driver.getName() + "，");
+ reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward1_content = document1.getElementById("reward1_content");
reward1_content.text("A total of " + dao.getOrderNum() + " orders have been received today, and the reward GHS" + dah.getMoney() + " will be awarded, please check");
}
@@ -1863,7 +1861,7 @@
document1.getElementById("carAudit2").attr("style", "display: none;");
Element reward2_user = document1.getElementById("reward2_user");
- reward2_user.text("Bonjour " + driver.getName() + "，");
+ reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");
Element reward2_content = document1.getElementById("reward2_content");
reward2_content.text("Un total de " + dao.getOrderNum() + " commandes ont été reçues aujourd’hui, et la récompense GHS " + dah.getMoney() + " sera décernée, s’il vous plaît vérifier");
}
@@ -1879,16 +1877,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 is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error("账号正在审核中，请耐心等待");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error("账号已被冻结，请联系管理员");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
}
List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
boolean b = true;
@@ -1899,7 +1897,7 @@
}
}
if(b){
- return ResultUtil.error("没有出租车业务权限");
+ return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
}
//开始自动设置接单类型，出车类型，上班状态
@@ -1977,16 +1975,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 is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error("账号正在审核中，请耐心等待");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error("账号已被冻结，请联系管理员");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
}
List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
boolean b = true;
@@ -1997,7 +1995,7 @@
}
}
if(b){
- return ResultUtil.error("没有出租车业务权限");
+ return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
}
//开始自动设置接单类型，出车类型，上班状态
@@ -2063,16 +2061,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 is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error("账号正在审核中，请耐心等待");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error("账号已被冻结，请联系管理员");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
}
List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
boolean b = true;
@@ -2083,7 +2081,7 @@
}
}
if(b){
- return ResultUtil.error("没有出租车业务权限");
+ return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
}
//开始自动设置接单类型，出车类型，上班状态
@@ -2169,13 +2167,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 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
}
if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){
- return ResultUtil.error("密码错误");
+ return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
}
return ResultUtil.success();
}
@@ -2188,10 +2186,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 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
}
driver.setWithdrawPassword(ShiroKit.md5(withdrawPassword, salt));
this.updateById(driver);
@@ -2207,16 +2205,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 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
}
if(null == driver.getWithdrawPassword()){
- return ResultUtil.error("请先设置提现密码");
+ return ResultUtil.error(language == 1 ? "请先设置提现密码" : language == 2 ? "Please set the withdrawal password first" : "Veuillez d’abord définir un mot de passe de retrait");
}
if(!driver.getWithdrawPassword().equals(ShiroKit.md5(withdrawPassword, salt))){
- return ResultUtil.error("密码错误");
+ return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
}
return ResultUtil.success();
}
--
Gitblit v1.7.1