From efd4e4fadb4f711a8b0573edc808d6f0045f366c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 08 十月 2023 17:03:15 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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 65cb1ba..368a89d 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
@@ -547,7 +547,7 @@
Driver driver = this.selectById(uid);
driver.setLastName(registeredWarpper.getLastName());
driver.setFirstName(registeredWarpper.getFirstName());
-// driver.setSex(registeredWarpper.getSex());
+ driver.setSex(registeredWarpper.getSex());
driver.setIdCard(registeredWarpper.getIdCard());
driver.setBirthday(registeredWarpper.getBirthday());
@@ -588,6 +588,7 @@
// driver.setGetDriverLicenseDate(registeredWarpper.getGetDriverLicenseDate());
driver.setDriveCardImgUrl1(registeredWarpper.getDriveCardImgUrl());
driver.setDriveCardImgUrl2(registeredWarpper.getDriveCardImgUrl2());
+ driver.setDriveCard(registeredWarpper.getDriveCard());
driver.setEmail(registeredWarpper.getEmail());
this.updateById(driver);
@@ -1279,7 +1280,7 @@
Element pass1_user = document1.getElementById("pass1_user");
pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
}
- if(2 == language){
+ if(3 == language){
document1.getElementById("chinese").remove();
document1.getElementById("english").remove();
document1.getElementById("invite2").remove();
@@ -1365,6 +1366,9 @@
}
if(car.getAuthState() == 3){
return ResultUtil.error(language == 1 ? "车辆已冻结" : language == 2 ? "Vehicle frozen" : "Le véhicule a été gelé");
+ }
+ if(car.getAuthState() == 4){
+ return ResultUtil.error(language == 1 ? "车辆审核不通过" : language == 2 ? "Vehicle audit failed" : "Échec de l’audit du véhicule");
}
boolean idle = carService.idle(carId);
if(!idle){
@@ -1493,17 +1497,21 @@
case 1://邀请司机注册
DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityRegistered.getId());
- activityWarpper.setContent("邀请司机注册奖励" + driverActivityRegistered.getMoney() + "元");
+ activityWarpper.setContent(language == 1 ? "邀请司机注册奖励" + driverActivityRegistered.getMoney() + "元" :
+ language == 2 ? "Invitation driver registration reward " + driverActivityRegistered.getMoney() + " yuan" :
+ "Invitation pilote inscription récompense " + driverActivityRegistered.getMoney() + " yuan");
break;
case 2://邀请用户注册
DriverActivityRegistered driverActivityRegistered1 = driverActivityRegisteredMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityRegistered1.getId());
- activityWarpper.setContent("邀请用户注册奖励" + driverActivityRegistered1.getMoney() + "元");
+ activityWarpper.setContent(language == 1 ? "邀请用户注册奖励" + driverActivityRegistered1.getMoney() + "元" :
+ language == 2 ? "" : "");
break;
case 3://累计在线
DriverActivityOnline driverActivityOnline = driverActivityOnlineMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityOnline.getId());
- StringBuffer sb = new StringBuffer("今日");
+ StringBuffer sb = new StringBuffer(language == 1 ? "今日" :
+ language == 2 ? "today" : "aujourd’hui");
DriverWork driverWork = driverWorkMapper.queryNewWork(uid, driverActivityOnline.getType(), 1);
Integer hour = 0;
if(null != driverWork){
@@ -1515,7 +1523,6 @@
break;
case 2:
sb.append("出租车");
-
break;
case 3:
sb.append("城际出行");
@@ -1524,14 +1531,18 @@
sb.append(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
break;
}
- String str = "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元";
+ String str = language == 1 ? "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元" :
+ language == 2 ? "RMB " + driverActivityOnline.getMoney() + " will be awarded for " + driverActivityOnline.getOnline() + " hours online" :
+ "Bonus de " + driverActivityOnline.getMoney() + " $pour " + driverActivityOnline.getOnline() + " heures cumulées en ligne";
activityWarpper.setContent(sb.append(str).toString());
activityWarpper.setCarryOut((dah.getCarryOut() == 2 || hour > driverActivityOnline.getOnline()) ? driverActivityOnline.getOnline() + "/" +driverActivityOnline.getOnline() : hour + "/" + driverActivityOnline.getOnline());
break;
case 4://订单量
DriverActivityOrder driverActivityOrder = driverActivityOrderMapper.selectById(dah.getActivityId());
activityWarpper.setId(driverActivityOrder.getId());
- activityWarpper.setContent("今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励" + driverActivityOrder.getMoney() + "元");
+ activityWarpper.setContent(language == 1 ? "今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励" + driverActivityOrder.getMoney() + "元" :
+ language == 2 ? "From " + driverActivityOrder.getStart() + " to " + driverActivityOrder.getEnd() + " today, a total of " + driverActivityOrder.getOrderNum() + " orders will be awarded " + driverActivityOrder.getMoney() + " yuan" :
+ "De " + driverActivityOrder.getStart() + " à " + driverActivityOrder.getEnd() + " aujourd’hui, un total de " + driverActivityOrder.getOrderNum() + " commandes recevront " + driverActivityOrder.getMoney() + " yuans");
SimpleDateFormat sdf = new SimpleDateFormat("H:m");
Date start = sdf.parse(driverActivityOrder.getStart());
Date end = sdf.parse(driverActivityOrder.getEnd());
@@ -1629,7 +1640,7 @@
}
if (3 == language) {
document1.getElementById("chinese").remove();
- document1.getElementById("french").remove();
+ document1.getElementById("english").remove();
document1.getElementById("invite2").remove();
document1.getElementById("user2").remove();
document1.getElementById("settle2").remove();
--
Gitblit v1.7.1