From e2d01b2009c30173ff8e9f77d5c065f4d38fa49d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 17:56:07 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java
index 700326a..6e6d519 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java
@@ -41,14 +41,14 @@
* @throws Exception
*/
@Override
- public ResultUtil updateOrders(Integer uid, Integer type) throws Exception {
+ public ResultUtil updateOrders(Integer uid, Integer type, Integer language) throws Exception {
DriverOrders query = driverOrdersMapper.query(uid, type);
if(null == query){
if(type == 3){
Driver driver = driverService.selectById(uid);
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");
}
}
query = new DriverOrders();
@@ -59,7 +59,7 @@
//判断当前业务是否已经出车
DriverWork driverWork = driverWorkMapper.queryNewWork(uid, type, 1);
if(null != driverWork){
- return ResultUtil.error("该业务已经出车，无法取消设置");
+ return ResultUtil.error(language == 1 ? "该业务已经出车，无法取消设置" : language == 2 ? "The driver is on the way, no way to cancel." : "Le chauffeur est en route, pas moyen de l’annuler.");
}
this.deleteById(query.getId());
}
--
Gitblit v1.7.1