From ad971e327c012eaf041a32ce95682619505fb64a Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 12 四月 2024 22:38:32 +0800
Subject: [PATCH] 新增加功能
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 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..3758186 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);
@@ -342,6 +337,7 @@
out.close();
break;
case 6://结束服务（专车可以返回继续服务）不修改状态
+ orderPrivateCar.setState(6);
orderPrivateCar.setGetoffLon(lon);
orderPrivateCar.setGetoffLat(lat);
orderPrivateCar.setGetoffAddress(address);
@@ -779,4 +775,25 @@
System.err.println("预支付数据异常（orderId = " + id + ")");
}
}
+
+
+ /**
+ * 处理乘客修改终点
+ * @param orderId
+ * @param status
+ */
+ @Override
+ public void updateEndAddress(Integer orderId, Integer status) {
+ OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ if(2 == status){
+ orderPrivateCar.setEndLon(Double.valueOf(orderPrivateCar.getDestinationLon()));
+ orderPrivateCar.setEndLat(Double.valueOf(orderPrivateCar.getDestinationLat()));
+ orderPrivateCar.setEndAddress(orderPrivateCar.getDestination());
+ }
+ orderPrivateCar.setDestinationLon("");
+ orderPrivateCar.setDestination("");
+ orderPrivateCar.setDestinationLat("");
+ this.updateById(orderPrivateCar);
+ pushUtil.pushModifyAddress(1, orderPrivateCar.getUserId(), orderId, 1, status);
+ }
}
--
Gitblit v1.7.1