From af06cd29722f6cb1c431565c4710d9fe9b7b33a1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 19:13:07 +0800
Subject: [PATCH] 修改bug和翻译
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 155 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 120 insertions(+), 35 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 3ab7da3..2d6aea2 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
@@ -18,6 +18,7 @@
import com.stylefeng.guns.modular.system.util.GoogleMap.DistancematrixVo;
import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil;
import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
+import com.stylefeng.guns.modular.system.util.GoogleMap.ReverseGeocodeVo;
import com.stylefeng.guns.modular.system.util.quartz.QuartzUtil;
import com.stylefeng.guns.modular.system.util.quartz.jobs.OrderTimeOutJob;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
@@ -194,6 +195,7 @@
@Override
public synchronized ResultUtil grabOrder(Integer orderId, Integer uid, Integer language) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ String tripId = redisUtil.getValue("trip" + orderPrivateCar.getUserId());
//处理摆渡车的情况
if(orderPrivateCar.getType() == 2){
//查看用户下的摆渡车是否已被人抢了
@@ -239,7 +241,7 @@
String value = redisUtil.getValue("DRIVER" + driver.getId());
if(ToolUtil.isNotEmpty(value)) {
String[] split = value.split(",");
- DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]));
+ DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]), tripId);
//超时时间
long timeOut = System.currentTimeMillis() + (distancematrix.getDuration() * 1000);
orderPrivateCar.setEstimateArriveTime(new Date(timeOut));
@@ -388,13 +390,53 @@
String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
if(ToolUtil.isEmpty(vehicles)){
CarModel carModel = carModelMapper.selectById(car.getCarModelId());
- fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ boolean createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ if(!createVehicles){
+ for (int i = 0; i < 5; i++) {
+ createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ if(createVehicles){
+ break;
+ }
+ try {
+ Thread.sleep(5000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
}
- fleetEngineUtil.createTrip(car.getVehicleId(), 1, orderPrivateCar.getTripId(),
+ boolean createTrip = fleetEngineUtil.createTrip(car.getVehicleId(), 1, orderPrivateCar.getTripId(),
orderPrivateCar.getStartLat().toString(), orderPrivateCar.getStartLon().toString(), orderPrivateCar.getEndLat().toString(), orderPrivateCar.getEndLon().toString());
+ if(!createTrip){
+ for (int i = 0; i < 5; i++) {
+ createTrip = fleetEngineUtil.createTrip(car.getVehicleId(), 1, orderPrivateCar.getTripId(),
+ orderPrivateCar.getStartLat().toString(), orderPrivateCar.getStartLon().toString(), orderPrivateCar.getEndLat().toString(), orderPrivateCar.getEndLon().toString());
+ if(createTrip){
+ break;
+ }
+ try {
+ Thread.sleep(5000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
}
//开始修改行程数据
- fleetEngineUtil.updateTrip(null, car.getVehicleId(), null, orderPrivateCar.getTripId(), null, null, null, null);
+ boolean updateTrip = fleetEngineUtil.updateTrip(null, car.getVehicleId(), null, orderPrivateCar.getTripId(), null, null, null, null);
+ if(!updateTrip){
+ for (int i = 0; i < 5; i++) {
+ updateTrip = fleetEngineUtil.updateTrip(null, car.getVehicleId(), null, orderPrivateCar.getTripId(), null, null, null, null);
+ if(updateTrip){
+ break;
+ }
+ try {
+ Thread.sleep(5000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
}catch (Exception e){
e.printStackTrace();
}
@@ -411,13 +453,13 @@
}
}
}).start();
-
-
+
+ Integer language1 = userInfoMapper.selectById(orderPrivateCar.getUserId()).getLanguage();
systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得打车订单，请及时联系客户！" :
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 the driver- " + driver.getFirstName() + ", please keep your line on."
+ systemNoticeService.addSystemNotice(1, language1 == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
+ language1 == 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();
}
@@ -457,6 +499,7 @@
timeOutCancel = orderPrivateCar.getTravelTime().getTime();
}
map.put("timeOutCancel", timeOutCancel);
+ map.put("isDispute", orderPrivateCar.getIsDispute());
return map;
}
@@ -470,8 +513,14 @@
* @throws Exception
*/
@Override
- public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,String phone, Integer language, Integer uid) throws Exception {
+ public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat,String phone, Integer language, Integer uid) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ String tripId = redisUtil.getValue("trip" + orderPrivateCar.getUserId());
+ ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lon, tripId);
+ if(null == reverseGeocode){
+ return ResultUtil.error(language == 1 ? "无效的经纬度" : language == 2 ? "Invalid longitude and latitude" : "Longitude et latitude non valides");
+ }
+ String address = reverseGeocode.getAddress();
if(!uid.equals(orderPrivateCar.getDriverId())){
return ResultUtil.error(language == 1 ? "操作失败，请刷新订单" : language == 2 ? "Operation failed, please refresh the order" : "L’opération a échoué, veuillez actualiser la commande");
}
@@ -484,20 +533,22 @@
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");
}
+ Integer language1 = userInfoMapper.selectById(orderPrivateCar.getUserId()).getLanguage();
+
String tripStatus = "UNKNOWN_TRIP_STATUS";
String audioUrl = "";
switch (state){
case 3://出发前往预约点
orderPrivateCar.setState(3);
orderPrivateCar.setSetOutTime(new Date());
- systemNoticeService.addSystemNotice(1, language == 1 ? "司机已出发，请耐心等待" : language == 2 ? "The driver is on the way, please wait." : "Le chauffeur est en route. Veuillez patienter.", orderPrivateCar.getUserId());
+ systemNoticeService.addSystemNotice(1, language1 == 1 ? "司机已出发，请耐心等待" : language1 == 2 ? "The driver is on the way, please wait." : "Le chauffeur est en route. Veuillez patienter.", orderPrivateCar.getUserId());
pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);//主动推送司机定位
tripStatus = "ENROUTE_TO_PICKUP";
break;
case 4://到达预约点，等待客户上车
orderPrivateCar.setState(4);
orderPrivateCar.setArriveTime(new Date());
- systemNoticeService.addSystemNotice(1, language == 1 ? "司机已到达您设置的预约地点，请及时上车" : language == 2 ?
+ systemNoticeService.addSystemNotice(1, language1 == 1 ? "司机已到达您设置的预约地点，请及时上车" : language1 == 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());
tripStatus = "ARRIVED_AT_PICKUP";
@@ -536,13 +587,13 @@
tripStatus = "ENROUTE_TO_DROPOFF";
switch (language){
case 1:
- audioUrl = "http://182.160.16.251:81/files/audio/system/OnboardReminder-CN.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/OnboardReminder-CN.mp3";
break;
case 2:
- audioUrl = "http://182.160.16.251:81/files/audio/system/OnboardReminder-EN.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/OnboardReminder-EN.mp3";
break;
case 3:
- audioUrl = "http://182.160.16.251:81/files/audio/system/OnboardReminder-FR.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/OnboardReminder-FR.mp3";
break;
}
break;
@@ -556,13 +607,13 @@
tripStatus = "COMPLETE";
switch (language){
case 1:
- audioUrl = "http://182.160.16.251:81/files/audio/system/ReachDestination-CN.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/ReachDestination-CN.mp3";
break;
case 2:
- audioUrl = "http://182.160.16.251:81/files/audio/system/ReachDestination-EN.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/ReachDestination-EN.mp3";
break;
case 3:
- audioUrl = "http://182.160.16.251:81/files/audio/system/ReachDestination-FR.mp3";
+ audioUrl = "https://igo.i-go.group/files/audio/system/ReachDestination-FR.mp3";
break;
}
break;
@@ -573,11 +624,21 @@
String finalTripStatus = tripStatus;
new Thread(()->{
//修改行程数据
- try {
- fleetEngineUtil.updateTrip(finalTripStatus, null, 1, orderPrivateCar.getTripId(), null, null, null, null);
- } catch (Exception e) {
- throw new RuntimeException(e);
+ boolean updateTrip = fleetEngineUtil.updateTrip(finalTripStatus, null, 1, orderPrivateCar.getTripId(), null, null, null, null);
+ if(!updateTrip){
+ for (int i = 0; i < 5; i++) {
+ updateTrip = fleetEngineUtil.updateTrip(finalTripStatus, null, 1, orderPrivateCar.getTripId(), null, null, null, null);
+ if(updateTrip){
+ break;
+ }
+ try {
+ Thread.sleep(5000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
+
}).start();
// TODO: 2020/6/5 推送状态
@@ -615,6 +676,10 @@
if(orderPrivateCar.getArriveTime()==null){
orderPrivateCar.setArriveTime(orderPrivateCar.getStartServiceTime());
}
+
+ //获取google trip_info获取轨迹线路，重新存储轨迹和计算行驶距离和时间
+
+
orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
orderPrivateCar.setPayManner(type);
orderPrivateCar.setParkMoney(null == parkingFee ? 0D : parkingFee);
@@ -675,7 +740,9 @@
pushUtil.removeTask(orderId, 1);//删除定时任务，结束推送数据
- systemNoticeService.addSystemNotice(1, language == 1 ? "司机已结束本次行程，谢谢使用" : language == 2 ?
+ UserInfo userInfo = userInfoMapper.selectById(orderPrivateCar.getUserId());
+ Integer language1 = userInfo.getLanguage();
+ systemNoticeService.addSystemNotice(1, language1 == 1 ? "司机已结束本次行程，谢谢使用" : language1 == 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());
//回滚司机状态为空闲
@@ -694,13 +761,21 @@
OrderPrivateCar finalOrderPrivateCar = orderPrivateCar;
new Thread(()->{
- try {
- //上报google
- fleetEngineUtil.reportBillableEvent(finalOrderPrivateCar.getTripId());
- log.warn("上报时间：{}，tripid：{}，created_at：{}，completed_at：{}", System.currentTimeMillis(), finalOrderPrivateCar.getTripId(),
- finalOrderPrivateCar.getInsertTime().getTime(), finalOrderPrivateCar.getEndServiceTime().getTime());
- }catch (Exception e){
- e.printStackTrace();
+ //上报google
+ log.warn("行程结束：{} {}", System.currentTimeMillis(), finalOrderPrivateCar.getTripId());
+ boolean reportBillableEvent = fleetEngineUtil.reportBillableEvent(finalOrderPrivateCar.getTripId());
+ if(!reportBillableEvent){
+ for (int i = 0; i < 5; i++) {
+ reportBillableEvent = fleetEngineUtil.reportBillableEvent(finalOrderPrivateCar.getTripId());
+ if(reportBillableEvent){
+ break;
+ }
+ try {
+ Thread.sleep(5000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
}).start();
return ResultUtil.success();
@@ -738,6 +813,7 @@
map.put("couponMoney", orderPrivateCar.getCouponMoney());//优惠券抵扣金额
map.put("discountMoney", orderPrivateCar.getDiscountMoney());//折扣抵扣金额
map.put("discount", orderPrivateCar.getDiscount());//折扣
+ map.put("isDispute", orderPrivateCar.getIsDispute());
return map;
}
@@ -1050,12 +1126,21 @@
orderPrivateCar.setEndLat(Double.valueOf(orderPrivateCar.getDestinationLat()));
orderPrivateCar.setEndAddress(orderPrivateCar.getDestination());
//修改google地图行程终点
- try {
- fleetEngineUtil.updateTrip(null, null, null, orderPrivateCar.getTripId(),
- null, null, orderPrivateCar.getEndLat().toString(), orderPrivateCar.getEndLon().toString());
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException(e);
+ boolean updateTrip = fleetEngineUtil.updateTrip(null, null, null, orderPrivateCar.getTripId(),
+ null, null, orderPrivateCar.getEndLat().toString(), orderPrivateCar.getEndLon().toString());
+ if(!updateTrip){
+ for (int i = 0; i < 5; i++) {
+ updateTrip = fleetEngineUtil.updateTrip(null, null, null, orderPrivateCar.getTripId(),
+ null, null, orderPrivateCar.getEndLat().toString(), orderPrivateCar.getEndLon().toString());
+ if(updateTrip){
+ break;
+ }
+ try {
+ Thread.sleep(5000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
}
orderPrivateCar.setDestinationLon("");
--
Gitblit v1.7.1