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'
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
index c76510c..dc3c1b7 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
@@ -62,12 +62,12 @@
*/
@Override
public ResultUtil orderCharteredCar(Date travelTime, Integer carTime, Integer serverCarModelId, String modelUse, Integer peopleNumber,
- String contactPerson, String contactPhone, String placeLonLat, Integer uid) throws Exception {
+ String contactPerson, String contactPhone, String placeLonLat, Integer uid, Integer language) throws Exception {
OrderCharteredCar orderCharteredCar = new OrderCharteredCar();
orderCharteredCar.setUserId(uid);
- Company query = companyCityService.query(placeLonLat.split(",")[0], placeLonLat.split(",")[1]);
+ Company query = companyCityService.query1(placeLonLat.split(",")[0], placeLonLat.split(",")[1]);
if(null == query){
- return ResultUtil.error("该地点暂无企业服务");
+ return ResultUtil.error(language == 1 ? "该地点暂无企业服务" : language == 2 ? "No corporate services are available at this location" : "Aucun service d’entreprise n’est disponible pour cet emplacement");
}
orderCharteredCar.setCompanyId(query.getId());
orderCharteredCar.setOrderNumber(this.getOrderNum());
@@ -102,7 +102,7 @@
@Override
- public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid) throws Exception {
+ public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Integer language) throws Exception {
if(ToolUtil.isNotEmpty(remark)){
if(ToolUtil.isNotEmpty(remark)){
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
@@ -114,10 +114,10 @@
OrderCharteredCar orderCharteredCar = this.selectById(id);
if(null == orderCharteredCar){
- return ResultUtil.error("取消订单失败，订单信息有误");
+ return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Cancel order failed, order information is incorrect" : "Annulation échouée, informations de commande incorrectes");
}
if(orderCharteredCar.getState() != 1){
- return ResultUtil.error("取消订单失败，不合法的操作");
+ return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Cancel order failed, illegal operation" : "Annulation de la commande échouée, opération illégale");
}
OrderCancel orderCancel = new OrderCancel();
--
Gitblit v1.7.1