From 656ac293601d6da08d25e892a79604fe3edcd086 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 01 八月 2024 16:04:46 +0800
Subject: [PATCH] 修改2.0 bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 69 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 19 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 c7c6c56..b29e4b0 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
@@ -119,6 +119,9 @@
@Resource
private RedisUtil redisUtil;
+
+ @Resource
+ private IOrderCancelService orderCancelService;
@@ -284,9 +287,10 @@
jobDataMap.put("orderType", 1);
jobDataMap.put("language", language);
jobDataMap.put("timeOut", timeOut);
+ jobDataMap.put("driverTimeout", driverTimeout);
jobDataMap.put("describe", language == 1 ? "您已超时" + driverTimeout + "分钟，用户可免费取消订单" : language == 2 ? "Reminder You are overdue for " + driverTimeout + " minutes The subscriber could cancel the order for free Confirm" : "Rappel Vous êtes en retard de " + driverTimeout + " minutes L’abonné peut annuler la commande gratuitement Confirmer");
QuartzUtil.addSimpleQuartzTask(
- new OrderTimeOutJob().buildQuartzJob(UUIDUtil.getRandomCode(5) + "_" + orderPrivateCar.getId() + "_1", "ORDER_TIME_OUT", jobDataMap)
+ new OrderTimeOutJob().buildQuartzJob("1_" + orderPrivateCar.getId() + "_1", "ORDER_TIME_OUT", jobDataMap)
, new Date(timeOut), timeOut, 0);
//超时循环提醒
@@ -297,9 +301,10 @@
jobDataMap.put("orderType", 1);
jobDataMap.put("language", language);
jobDataMap.put("timeOut", orderPrivateCar.getEstimateArriveTime().getTime());
+ jobDataMap.put("driverTimeout", 0);
jobDataMap.put("describe", "");
QuartzUtil.addSimpleQuartzTask(
- new OrderTimeOutJob().buildQuartzJob(UUIDUtil.getRandomCode(5) + "_" + orderPrivateCar.getId() + "_1", "ORDER_TIME_OUT", jobDataMap)
+ new OrderTimeOutJob().buildQuartzJob("3_" + orderPrivateCar.getId() + "_1", "ORDER_TIME_OUT", jobDataMap)
, orderPrivateCar.getEstimateArriveTime(), reminderRules.getCar() * 60000, -1);
}else{
//超时时间
@@ -312,9 +317,10 @@
jobDataMap.put("orderType", 1);
jobDataMap.put("language", language);
jobDataMap.put("timeOut", timeOut);
+ jobDataMap.put("driverTimeout", driverTimeout);
jobDataMap.put("describe", language == 1 ? "您已超时" + driverTimeout + "分钟，用户可免费取消订单" : language == 2 ? "Reminder You are overdue for " + driverTimeout + " minutes The subscriber could cancel the order for free Confirm" : "Rappel Vous êtes en retard de " + driverTimeout + " minutes L’abonné peut annuler la commande gratuitement Confirmer");
QuartzUtil.addSimpleQuartzTask(
- new OrderTimeOutJob().buildQuartzJob(UUIDUtil.getRandomCode(5) + "_" + orderPrivateCar.getId() + "_1", "ORDER_TIME_OUT", jobDataMap)
+ new OrderTimeOutJob().buildQuartzJob("1_" + orderPrivateCar.getId() + "_1", "ORDER_TIME_OUT", jobDataMap)
, new Date(timeOut), timeOut, 0);
@@ -330,11 +336,12 @@
jobDataMap.put("orderType", 1);
jobDataMap.put("language", language);
jobDataMap.put("timeOut", timeOut);
+ jobDataMap.put("driverTimeout", 0);
jobDataMap.put("describe", language == 1 ? "您将于" + sdf.format(orderPrivateCar.getTravelTime()) + "去接" + (ToolUtil.isEmpty(userInfo.getFirstName()) ? userInfo.getNickName() : userInfo.getFirstName() + " " + userInfo.getLastName()) + "，请准时！" :
language == 2 ? "You are going to pick up " + (ToolUtil.isEmpty(userInfo.getFirstName()) ? userInfo.getNickName() : userInfo.getFirstName() + " " + userInfo.getLastName()) + " at " + sdf.format(orderPrivateCar.getTravelTime()) + ", please be on time. " :
"Vous allez chercher " + (ToolUtil.isEmpty(userInfo.getFirstName()) ? userInfo.getNickName() : userInfo.getFirstName() + " " + userInfo.getLastName()) + " à " + sdf.format(orderPrivateCar.getTravelTime()) + ", s’il vous plaît soyez à l’heure.");
QuartzUtil.addSimpleQuartzTask(
- new OrderTimeOutJob().buildQuartzJob(UUIDUtil.getRandomCode(5) + "_" + orderPrivateCar.getId() + "_1", "ORDER_TIME_OUT", jobDataMap)
+ new OrderTimeOutJob().buildQuartzJob("2_1_" + orderPrivateCar.getId() + "_1", "ORDER_TIME_OUT", jobDataMap)
, new Date(travelTime), travelTime, 0);
//预约单出发循环提醒
@@ -345,11 +352,12 @@
jobDataMap.put("orderType", 1);
jobDataMap.put("language", language);
jobDataMap.put("timeOut", orderPrivateCar.getTravelTime().getTime());
+ jobDataMap.put("driverTimeout", 0);
jobDataMap.put("describe", language == 1 ? "您将于" + sdf.format(orderPrivateCar.getTravelTime()) + "去接" + (ToolUtil.isEmpty(userInfo.getFirstName()) ? userInfo.getNickName() : userInfo.getFirstName() + " " + userInfo.getLastName()) + "，请准时！" :
language == 2 ? "You are going to pick up " + (ToolUtil.isEmpty(userInfo.getFirstName()) ? userInfo.getNickName() : userInfo.getFirstName() + " " + userInfo.getLastName()) + " at " + sdf.format(orderPrivateCar.getTravelTime()) + ", please be on time. " :
"Vous allez chercher " + (ToolUtil.isEmpty(userInfo.getFirstName()) ? userInfo.getNickName() : userInfo.getFirstName() + " " + userInfo.getLastName()) + " à " + sdf.format(orderPrivateCar.getTravelTime()) + ", s’il vous plaît soyez à l’heure.");
QuartzUtil.addSimpleQuartzTask(
- new OrderTimeOutJob().buildQuartzJob(UUIDUtil.getRandomCode(5) + "_" + orderPrivateCar.getId() + "_1", "ORDER_TIME_OUT", jobDataMap)
+ new OrderTimeOutJob().buildQuartzJob("2_2_" + orderPrivateCar.getId() + "_1", "ORDER_TIME_OUT", jobDataMap)
, new Date(travelTime + reminderRules.getReserveNext() * 60000), reminderRules.getReserveNext() * 60000, -1);
//超时循环提醒
@@ -360,9 +368,10 @@
jobDataMap.put("orderType", 1);
jobDataMap.put("language", language);
jobDataMap.put("timeOut", orderPrivateCar.getTravelTime().getTime());
+ jobDataMap.put("driverTimeout", 0);
jobDataMap.put("describe", "");
QuartzUtil.addSimpleQuartzTask(
- new OrderTimeOutJob().buildQuartzJob(UUIDUtil.getRandomCode(5) + "_" + orderPrivateCar.getId() + "_1", "ORDER_TIME_OUT", jobDataMap)
+ new OrderTimeOutJob().buildQuartzJob("3_" + orderPrivateCar.getId() + "_1", "ORDER_TIME_OUT", jobDataMap)
, orderPrivateCar.getTravelTime(), reminderRules.getCar() * 60000, -1);
}
}
@@ -395,8 +404,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState());
- pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState());
+ pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0, "");
if(orderPrivateCar.getType() == 2){
pushUtil.pushFerryOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, 2);
}
@@ -424,11 +433,30 @@
@Override
public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
Map<String, Object> map = orderPrivateCarMapper.queryOrderInfo(orderId);
+ OrderPrivateCar orderPrivateCar = this.selectById(orderId);
if(null != map.get("travelTime_")){
String travelTime_ = map.get("travelTime_").toString();
map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
}
+ Integer orderState = Integer.valueOf(map.get("orderState").toString());
+ if(orderState == 12){
+ OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>().eq("orderId", orderId)
+ .eq("orderType", 1).eq("state", 1).orderBy("insertTime desc limit 0, 1"));
+ if(null != orderCancel){
+ map.put("cancelPayMoney", orderCancel.getMoney());
+ }
+ }
map.put("cancelUser", language == 1 ? "用户" : language == 2 ? "The client" : "Le client");
+ long timeOutCancel = 0L;
+// CancleOrder cancleOrder = cancleOrderService.selectOne(new EntityWrapper<CancleOrder>().eq("companyId", orderPrivateCar.getCompanyId()));
+// JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());
+// int driverTimeout = jsonObject.getIntValue("driverTimeout") * 60000;
+ if(orderPrivateCar.getOrderType() == 1 && null != orderPrivateCar.getEstimateArriveTime()){
+ timeOutCancel = orderPrivateCar.getEstimateArriveTime().getTime();
+ }else{
+ timeOutCancel = orderPrivateCar.getTravelTime().getTime();
+ }
+ map.put("timeOutCancel", timeOutCancel);
return map;
}
@@ -505,13 +533,13 @@
tripStatus = "ENROUTE_TO_DROPOFF";
switch (language){
case 1:
- audioUrl = "http://182.160.16.251:81/files/audio/OnboardReminder-CN.mp3";
+ audioUrl = "http://182.160.16.251:81/files/audio/system/OnboardReminder-CN.mp3";
break;
case 2:
- audioUrl = "http://182.160.16.251:81/files/audio/OnboardReminder-EN.mp3";
+ audioUrl = "http://182.160.16.251:81/files/audio/system/OnboardReminder-EN.mp3";
break;
case 3:
- audioUrl = "http://182.160.16.251:81/files/audio/OnboardReminder-FR.mp3";
+ audioUrl = "http://182.160.16.251:81/files/audio/system/OnboardReminder-FR.mp3";
break;
}
break;
@@ -525,13 +553,13 @@
tripStatus = "COMPLETE";
switch (language){
case 1:
- audioUrl = "http://182.160.16.251:81/files/audio/ReachDestination-CN.mp3";
+ audioUrl = "http://182.160.16.251:81/files/audio/system/ReachDestination-CN.mp3";
break;
case 2:
- audioUrl = "http://182.160.16.251:81/files/audio/ReachDestination-EN.mp3";
+ audioUrl = "http://182.160.16.251:81/files/audio/system/ReachDestination-EN.mp3";
break;
case 3:
- audioUrl = "http://182.160.16.251:81/files/audio/ReachDestination-FR.mp3";
+ audioUrl = "http://182.160.16.251:81/files/audio/system/ReachDestination-FR.mp3";
break;
}
break;
@@ -554,8 +582,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, finalOrderPrivateCar.getUserId(), finalOrderPrivateCar.getId(), 1, finalOrderPrivateCar.getState());
- pushUtil.pushOrderState(2, finalOrderPrivateCar.getDriverId(), finalOrderPrivateCar.getId(), 1, finalOrderPrivateCar.getState());
+ pushUtil.pushOrderState(1, finalOrderPrivateCar.getUserId(), finalOrderPrivateCar.getId(), 1, finalOrderPrivateCar.getState(), 0, "");
+ pushUtil.pushOrderState(2, finalOrderPrivateCar.getDriverId(), finalOrderPrivateCar.getId(), 1, finalOrderPrivateCar.getState(), 0, "");
}
}).start();
return ResultUtil.success(audioUrl);
@@ -653,8 +681,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 1, finalOrderTaxi.getState());
- pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 1, finalOrderTaxi.getState());
+ pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 1, finalOrderTaxi.getState(), 0, "");
+ pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 1, finalOrderTaxi.getState(), 0, "");
}
}).start();
@@ -716,6 +744,9 @@
@Override
public boolean calculateMileage(Integer orderId, String lon, String lat) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ if(orderPrivateCar.getState() == 2){
+ return false;
+ }
OrderPosition orderPosition = orderPositionService.queryNew(orderId, 1);
String now = lon + "," + lat;
String old = null;
@@ -731,7 +762,7 @@
Map<String, Double> distance = GeodesyUtil.getDistance(now, old);
if(null != distance){
Double distance1 = distance.get("WGS84");
- if(distance1 > 50 && orderPrivateCar.getState() < 5){//大于50米表示在移动
+ if(distance1 > 50 && Arrays.asList(3, 4).contains(orderPrivateCar.getState())){//大于50米表示在移动
orderPrivateCar.setToStartPointMileage(new BigDecimal(orderPrivateCar.getToStartPointMileage()).add(new BigDecimal(distance1)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
this.updateById(orderPrivateCar);
return true;
--
Gitblit v1.7.1