From ddcef762ff4a159e132c68dfec512c60a68a53e6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 十二月 2023 18:21:24 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 130 ++++++++++++++++++++++++-------------------
1 files changed, 73 insertions(+), 57 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 24269b7..f677fb2 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -177,13 +177,13 @@
Driver driver1 = driverMapper.queryByPhone(phone);
if(null != driver1){
if(driver1.getAuthState() == 1){
- return ResultUtil.error(language == 1 ? "该司机正在审核中" : language == 2 ? "The driver is currently under review" : "The driver is currently under review");
+ 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 already exists" : "Les Driver already exists");
+ 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 ? "The driver's account has been frozen" : "Le compte du conducteur a été froid");
+ return ResultUtil.error(language == 1 ? "该司机账号已被冻结" : language == 2 ? "Driver account is frozen." : "Le compte du chauffeur est gelé.");
}
}
}
@@ -481,7 +481,7 @@
public ResultUtil<LoginWarpper> registeredDriver(String phoneOperator, String phone, String code, String password,Integer uid,Integer uType, Integer language) throws Exception {
boolean b = this.checkCaptcha("", phone, code);
if(!b){
- return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}
Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据
@@ -555,7 +555,7 @@
String[] city = new String[]{city1.getEnglishName()};
Company query = companyCityService.query(city);
if(null == query){
- return ResultUtil.error(language == 1 ? "选择从业地暂未开通业务" : language == 2 ? "The selected place of employment has not yet opened business" : "Choisir un lieu de pratique pas encore ouvert");
+ return ResultUtil.error(language == 1 ? "选择从业地暂未开通业务" : language == 2 ? "Not yet to commence business at the workplace selected." : "N’a pas encore commencé ses activités sur le lieu de travail sélectionné.");
}
if(null != query){
switch (query.getType()){
@@ -726,11 +726,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(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}
Driver driver = driverMapper.queryByPhone(phone);
if(null == driver){
- return ResultUtil.error(language == 1 ? "电话号码未注册" : language == 2 ? "The phone number is not registered" : "Numéro de téléphone non enregistré");
+ return ResultUtil.error(language == 1 ? "电话号码未注册" : language == 2 ? "Mobile phone number was not registered." : "Le numéro de téléphone portable n’a pas été enregistré.");
}
driver.setPassword(ShiroKit.md5(password, salt));
driverMapper.updateById(driver);
@@ -877,16 +877,16 @@
public ResultUtil<LoginWarpper> driverLogin(String phone, String password, Integer language) throws Exception {
Driver driver = driverMapper.queryByPhone(phone);
if(null == driver){
- return ResultUtil.error(language == 1 ? "账号未注册" : language == 2 ? "Account not registered" : "Compte non enregistré");
+ return ResultUtil.error(language == 1 ? "账号未注册" : language == 2 ? "Account unregistered" : "Compte non enregistré");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
}
if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){
- return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
+ return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
}
String value = redisUtil.getValue("DEVICE_" + driver.getId());
@@ -1005,20 +1005,20 @@
}
//判断是否存在审核中的资料
if(driver.getAuthState()==1){
- return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data review, can't get out of the car" : "Données en cours de vérification, pas de voiture disponible");
+ return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data is being reviewed, unable to drive." : "Les données sont en cours d’examen, il est impossible de conduire.");
}
if(driver.getAuthState()==4){
- return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
+ return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire.");
}
Car car = carService.selectById(driver.getCarId());
if(car==null){
- return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
+ return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire.");
}
if(car.getAuthState()==1){
- return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data review, can't get out of the car" : "Données en cours de vérification, pas de voiture disponible");
+ return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data is being reviewed, unable to drive." : "Les données sont en cours d’examen, il est impossible de conduire.");
}
if(car.getAuthState()==4){
- return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
+ return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire.");
}
driverWork = new DriverWork();
driverWork.setState(1);
@@ -1110,9 +1110,9 @@
public Map<String, Object> queryHomeNum(Integer uid, Integer language) throws Exception {
Map<String, Object> map = new HashMap<>();
//出租车
- List<Map<String, Object>> list = orderTaxiService.queryOrderList(1, uid);
+ List<Map<String, Object>> list = orderTaxiService.queryOrderList(language, 1, uid);
map.put("service", list.size());//服务中
- list = orderTaxiService.queryOrderList(2, uid);
+ list = orderTaxiService.queryOrderList(language, 2, uid);
map.put("reservation", list.size());//预约
List<Map<String, Object>> list1 = orderLogisticsService.queryOrderList(uid, language);
map.put("small", list1.size());//小件
@@ -1137,7 +1137,7 @@
baseWarpper.setId(d.getType());
switch (d.getType()){
case 1:
- baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course ");
+ baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
break;
case 2:
baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi");
@@ -1146,7 +1146,7 @@
baseWarpper.setName(language == 1 ? "跨城出行" : language == 2 ? "Cross-town travel" : "Se déplacer à travers la ville");
break;
case 4:
- baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
+ baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison");
break;
case 5:
baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville");
@@ -1172,8 +1172,14 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryInfo(Integer uid) throws Exception {
+ public Map<String, Object> queryInfo(Integer language, Integer uid) throws Exception {
Map<String, Object> map = driverMapper.queryInfo(uid);
+ String birthday = map.get("birthday").toString();
+ map.put("birthday", DateUtil.conversionFormat(language, birthday));
+ String networkCarlssueDate = map.get("networkCarlssueDate").toString();
+ map.put("networkCarlssueDate", DateUtil.conversionFormat(language, networkCarlssueDate));
+ String getDriverLicenseDate = map.get("getDriverLicenseDate").toString();
+ map.put("getDriverLicenseDate", DateUtil.conversionFormat(language, getDriverLicenseDate));
if(ToolUtil.isEmpty(map.get("qrCode"))){
//获取小程序二维码
Driver driver = new Driver();
@@ -1198,11 +1204,11 @@
public ResultUtil updatePhone(String phoneOperator, String phone, String code, Integer uid, Integer language) throws Exception {
Driver driver = driverMapper.queryByPhone(phone);
if(null != driver){
- return ResultUtil.error(language == 1 ? "电话号码已被注册" : language == 2 ? "he phone number is registered" : "Le numéro de téléphone a été enregistré");
+ return ResultUtil.error(language == 1 ? "电话号码已被注册" : language == 2 ? "Mobile phone number has been registered." : "Le numéro de téléphone portable a été enregistré.");
}
boolean b = this.checkCaptcha("", phone, code);
if(!b){
- return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}
Driver driver1 = this.selectById(uid);
driver1.setAccount(phone);
@@ -1355,24 +1361,24 @@
public ResultUtil replaceCar(Integer carId, Integer uid, Integer language) throws Exception {
Driver driver = this.selectById(uid);
if(driver.getState() == 3){
- return ResultUtil.error(language == 1 ? "还在服务中，不能更换" : language == 2 ? "It is still in service and cannot be replaced" : "Toujours en service, non échangeable");
+ return ResultUtil.error(language == 1 ? "还在服务中，不能更换" : language == 2 ? "On trip, unable to change." : "En service, il est impossible de se changer.");
}
Car car = carService.selectById(carId);
if(null == car){
return ResultUtil.error(language == 1 ? "车辆无效" : language == 2 ? "Invalid vehicle" : "Véhicule non valide");
}
if(car.getAuthState() == 1){
- return ResultUtil.error(language == 1 ? "车辆正在审核中" : language == 2 ? "The vehicle is under review" : "Véhicule en révision");
+ return ResultUtil.error(language == 1 ? "车辆正在审核中" : language == 2 ? "Vehicle is being reviewed." : "Le véhicule est en cours d’examen.");
}
if(car.getAuthState() == 3){
- return ResultUtil.error(language == 1 ? "车辆已冻结" : language == 2 ? "Vehicle frozen" : "Le véhicule a été gelé");
+ return ResultUtil.error(language == 1 ? "车辆已冻结" : language == 2 ? "Vehicle is frozen." : "Le véhicule est gelé.");
}
if(car.getAuthState() == 4){
- return ResultUtil.error(language == 1 ? "车辆审核不通过" : language == 2 ? "Vehicle audit failed" : "Échec de l’audit du véhicule");
+ return ResultUtil.error(language == 1 ? "车辆审核不通过" : language == 2 ? "Vehicle is not verified and qualified." : "Le véhicule n’est pas vérifié ni qualifié.");
}
boolean idle = carService.idle(carId);
if(!idle){
- return ResultUtil.error(language == 1 ? "车辆已被绑定了" : language == 2 ? "The vehicle has been bound" : "e véhicule a été lié");
+ return ResultUtil.error(language == 1 ? "车辆已被绑定了" : language == 2 ? "Vehicle has been bound." : "Le véhicule a été connecté.");
}
driver.setCarId(carId);
this.updateById(driver);
@@ -1444,8 +1450,8 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryPenalties(Integer pageNum, Integer size, Integer uid) throws Exception {
- List<Map<String, Object>> list = reassignService.queryList(uid, pageNum, size);
+ public List<Map<String, Object>> queryPenalties(Integer language, Integer pageNum, Integer size, Integer uid) throws Exception {
+ List<Map<String, Object>> list = reassignService.queryList(language, uid, pageNum, size);
return list;
}
@@ -1459,8 +1465,8 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryActivityIncome(Integer uid, Integer pageNum, Integer size) throws Exception {
- List<Map<String, Object>> query = incomeService.query(2, uid, 1, pageNum, size);
+ public List<Map<String, Object>> queryActivityIncome(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception {
+ List<Map<String, Object>> query = incomeService.query(language,2, uid, 1, pageNum, size);
return query;
}
@@ -1474,8 +1480,8 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryTotalRevenue(Integer uid, Integer pageNum, Integer size) throws Exception {
- List<Map<String, Object>> query = incomeService.query(2, uid, 2, pageNum, size);
+ public List<Map<String, Object>> queryTotalRevenue(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception {
+ List<Map<String, Object>> query = incomeService.query(language, 2, uid, 2, pageNum, size);
return query;
}
@@ -1522,7 +1528,7 @@
}
switch (driverActivityOnline.getType()){
case 1:
- sb.append(language == 1 ? "打车" : language == 2 ? "Ride" : "Rouler");
+ sb.append(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
break;
case 2:
sb.append("出租车");
@@ -1531,7 +1537,7 @@
sb.append("城际出行");
continue;
case 4:
- sb.append(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
+ sb.append(language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison");
break;
}
String str = language == 1 ? "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元" :
@@ -2365,13 +2371,13 @@
public ResultUtil loginByJobNumber(String jobNum, Integer language) {
Driver driver = driverMapper.queryByJobNum(jobNum);
if(null == driver){
- return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
+ return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte.");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
}
List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
boolean b = true;
@@ -2382,7 +2388,7 @@
}
}
if(b){
- return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
+ return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
}
//开始自动设置接单类型，出车类型，上班状态
@@ -2463,13 +2469,13 @@
public ResultUtil loginByIdentification(String identification, Integer language) throws Exception {
Driver driver = driverMapper.queryByIdentification(identification);
if(null == driver){
- return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
+ return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte.");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
}
List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
boolean b = true;
@@ -2480,7 +2486,7 @@
}
}
if(b){
- return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
+ return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
}
//开始自动设置接单类型，出车类型，上班状态
@@ -2549,13 +2555,13 @@
public ResultUtil loginByTaxiAptitudeCard(String taxiAptitudeCard, Integer language) throws Exception {
Driver driver = driverMapper.queryByTaxiAptitudeCard(taxiAptitudeCard);
if(null == driver){
- return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
+ return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte.");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
}
List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
boolean b = true;
@@ -2566,7 +2572,7 @@
}
}
if(b){
- return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
+ return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
}
//开始自动设置接单类型，出车类型，上班状态
@@ -2655,10 +2661,10 @@
public ResultUtil verificationPassword(String password, Integer driverId, Integer language) throws Exception {
Driver driver = this.selectById(driverId);
if(null == driver){
- return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
+ return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau.");
}
if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){
- return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
+ return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
}
return ResultUtil.success();
}
@@ -2674,7 +2680,7 @@
public ResultUtil setWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception {
Driver driver = this.selectById(driverId);
if(null == driver){
- return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
+ return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau.");
}
driver.setWithdrawPassword(ShiroKit.md5(withdrawPassword, salt));
this.updateById(driver);
@@ -2693,13 +2699,13 @@
public ResultUtil verificationWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception {
Driver driver = this.selectById(driverId);
if(null == driver){
- return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
+ return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau.");
}
if(null == driver.getWithdrawPassword()){
- return ResultUtil.error(language == 1 ? "请先设置提现密码" : language == 2 ? "Please set the withdrawal password first" : "Veuillez d’abord définir un mot de passe de retrait");
+ return ResultUtil.error(language == 1 ? "请先设置提现密码" : language == 2 ? "Please set withdrawal password first." : "Veuillez d’abord définir le mot de passe de retrait.");
}
if(!driver.getWithdrawPassword().equals(ShiroKit.md5(withdrawPassword, salt))){
- return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
+ return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
}
return ResultUtil.success();
}
@@ -2735,14 +2741,24 @@
* @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
*/
@Override
- public List<Map<String,Object>> queryMyInviteList(Integer type,Integer uid, Integer pageNum, Integer size) throws Exception {
+ public List<Map<String,Object>> queryMyInviteList(Integer language, Integer type,Integer uid, Integer pageNum, Integer size) throws Exception {
pageNum = (pageNum - 1) * size;
if(type==1){
//乘客表uType为2表示是司机邀请的
- return userInfoMapper.queryMyInviteUserList(2,uid,pageNum,size);
+ List<Map<String, Object>> list = userInfoMapper.queryMyInviteUserList(2, uid, pageNum, size);
+ for (Map<String, Object> map : list) {
+ String insertTime = map.get("insertTime").toString();
+ map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
+ }
+ return list;
}else if(type==2){
//司机表uType为2表示是司机邀请的
- return driverMapper.queryMyInviteDriverList(2,uid, pageNum, size);
+ List<Map<String, Object>> list = driverMapper.queryMyInviteDriverList(2, uid, pageNum, size);
+ for (Map<String, Object> map : list) {
+ String insertTime = map.get("insertTime").toString();
+ map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
+ }
+ return list;
}
return null;
--
Gitblit v1.7.1