From 6c710eb8ac8ad3c5706eb0a805b4ccdc447bcdec Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 23 二月 2024 16:39:14 +0800
Subject: [PATCH] 修改
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index dcdd12d..1c65fee 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -264,6 +264,7 @@
String travelTime_ = map.get("travelTime_").toString();
map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
}
+ map.put("cancelUser", language == 1 ? "用户" : language == 2 ? "The client" : "Le client");
return map;
}
@@ -279,21 +280,15 @@
@Override
public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,String phone, Integer language) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
-// if(state==5){
-// UserInfo userInfo = userInfoMapper.selectById(orderPrivateCar.getUserId());
-// if(!userInfo.getPhone().substring(7, userInfo.getPhone().length()).equals(phone)){
-// return ResultUtil.error("手机号错误");
-// }
-// }
+ if(orderPrivateCar.getState().compareTo(state) == 0){
+ return ResultUtil.error(language == 1 ? "不能重复操作" : language == 2 ? "Unable to recur operate" : "Impossible de récurrence des opérer");
+ }
if(state==3 && orderPrivateCar.getState()!=2){
return ResultUtil.error(language == 1 ? "当前订单不能触发前往预约地点" : language == 2 ? "The current order cannot trigger travel to the reservation" : "La commande en cours ne peut pas déclencher une visite au lieu de rendez-vous");
}
if(state==4 && orderPrivateCar.getState()!=3){
return ResultUtil.error(language == 1 ? "当前订单不能到达预约地点" : language == 2 ? "The current order cannot arrive at the reservation" : "La commande en cours ne peut pas atteindre le rendez-vous");
}
- /*if(state==5 && orderPrivateCar.getState()!=4){
- return ResultUtil.error("当前订单不能开始服务");
- }*/
switch (state){
case 3://出发前往预约点
orderPrivateCar.setState(3);
--
Gitblit v1.7.1