From af6d43a41205f8c7fc1a965cb019c039063bf4f0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 13 十二月 2023 01:15:07 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 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 2eccc49..dcdd12d 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
@@ -104,8 +104,10 @@
public List<Map<String, Object>> queryOrderList(Integer state, Integer driverId, Integer language) throws Exception {
List<Map<String, Object>> list = orderPrivateCarMapper.queryOrderList(state, driverId, language);
for (Map<String, Object> map : list) {
- String time = map.get("time").toString();
- map.put("time", DateUtil.conversionFormat(language, time));
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
}
return list;
}
@@ -121,8 +123,10 @@
public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception {
List<Map<String, Object>> list = orderPrivateCarMapper.queryMyAllOrder(state, uid, language);
for (Map<String, Object> map : list) {
- String time = map.get("time").toString();
- map.put("time", DateUtil.conversionFormat(language, time));
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
}
return list;
}
@@ -137,8 +141,10 @@
@Override
public Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception {
Map<String, Object> map = orderPrivateCarMapper.queryPushOrder(orderId, language);
- String travelTime = map.get("travelTime").toString();
- map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
+ if(null != map.get("travelTime")){
+ String travelTime = map.get("travelTime").toString();
+ map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
+ }
return map;
}
@@ -235,11 +241,11 @@
}).start();
systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得打车订单，请及时联系客户！" :
- language == 2 ? "You have successfully grabbed a taxi order, please contact the customer in time!"
- : "Vous avez saisi avec succès une commande de taxi, veuillez contacter le client à temps!", orderPrivateCar.getDriverId());
+ language == 2 ? "You have grabbed the ride order, please contact the client timely."
+ : "Vous avez saisi la commande de course, veuillez contacter le client en temps opportun.", orderPrivateCar.getDriverId());
systemNoticeService.addSystemNotice(1, language == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
- language == 2 ? "Your order has been assigned to " + driver.getFirstName() + " master, please keep the phone open!"
- : "Votre commande a été attribuée à " + driver.getFirstName() + " master, veuillez garder le téléphone ouvert!", orderPrivateCar.getUserId());
+ language == 2 ? "Your order has been assigned to the driver- " + driver.getFirstName() + ", please keep your line on."
+ : "Votre commande a été attribuée au chauffeur- " + driver.getFirstName() + ", S'il vous plaît, restez en ligne.", orderPrivateCar.getUserId());
return ResultUtil.success();
}
@@ -254,8 +260,10 @@
@Override
public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
Map<String, Object> map = orderPrivateCarMapper.queryOrderInfo(orderId);
- String travelTime_ = map.get("travelTime_").toString();
- map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ if(null != map.get("travelTime_")){
+ String travelTime_ = map.get("travelTime_").toString();
+ map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ }
return map;
}
@@ -290,12 +298,14 @@
case 3://出发前往预约点
orderPrivateCar.setState(3);
orderPrivateCar.setSetOutTime(new Date());
- systemNoticeService.addSystemNotice(1, language == 1 ? "司机已出发，请耐心等待" : language == 2 ? "he driver has left, please wait patiently" : "Le chauffeur est parti, soyez patient", orderPrivateCar.getUserId());
+ systemNoticeService.addSystemNotice(1, language == 1 ? "司机已出发，请耐心等待" : language == 2 ? "The driver is on the way, please wait." : "Le chauffeur est en route. Veuillez patienter.", orderPrivateCar.getUserId());
break;
case 4://到达预约点，等待客户上车
orderPrivateCar.setState(4);
orderPrivateCar.setArriveTime(new Date());
- systemNoticeService.addSystemNotice(1, language == 1 ? "司机已到达您设置的预约地点，请及时上车" : language == 2 ? "The driver has arrived at the reservation place you set, please get on the bus in time" : "Le chauffeur est arrivé au lieu de rendez-vous que vous avez fixé, s’il vous plaît embarquez à temps", orderPrivateCar.getUserId());
+ systemNoticeService.addSystemNotice(1, language == 1 ? "司机已到达您设置的预约地点，请及时上车" : language == 2 ?
+ "The driver has arrived at the reserved location, please get in timely." :
+ "Le chauffeur est arrivé à l'endroit prévu, veuillez monter dans la voiture à temps.", orderPrivateCar.getUserId());
break;
case 5://开始服务
orderPrivateCar.setBoardingLon(lon);
@@ -365,7 +375,7 @@
* @throws Exception
*/
@Override
- public ResultUtil confirmFees(Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception {
+ public ResultUtil confirmFees(Integer language, Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
if(orderPrivateCar.getArriveTime()==null){
orderPrivateCar.setArriveTime(orderPrivateCar.getStartServiceTime());
@@ -430,7 +440,8 @@
pushUtil.removeTask(orderId, 1);//删除定时任务，结束推送数据
- systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderPrivateCar.getUserId());
+ systemNoticeService.addSystemNotice(1, language == 1 ? "司机已结束本次行程，谢谢使用" : language == 2 ?
+ "The driver has finished the trip,thank you for using I-GO" : "Le chauffeur a terminé le trajet, merci d'utiliser I-GO", orderPrivateCar.getUserId());
//回滚司机状态为空闲
Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
--
Gitblit v1.7.1