From f1c81c66b4ce666e61a3604e299ea41b874fa8b7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 08 二月 2025 17:57:52 +0800
Subject: [PATCH] 修改订单异常问题
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java | 12 +++---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java | 5 ++
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 7 +++
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 28 ++++++++++++--
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java | 5 ++
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 5 ++
6 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 88eeaae..54f88d7 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -988,7 +988,9 @@
for (int i = 0; i < 5; i++) {
updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
if(updateTrip){
- continue;
+ privateCar.setIsover(1);
+ orderPrivateCarService.updateById(privateCar);
+ break;
}
try {
Thread.sleep(3000L);
@@ -996,6 +998,9 @@
throw new RuntimeException(e);
}
}
+ }else{
+ privateCar.setIsover(1);
+ orderPrivateCarService.updateById(privateCar);
}
}
if(Arrays.asList(6, 7, 8, 9).contains(state) && !"COMPLETE".equals(tripStatus)){
@@ -1005,7 +1010,9 @@
for (int i = 0; i < 5; i++) {
updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
if(updateTrip){
- continue;
+ privateCar.setIsover(1);
+ orderPrivateCarService.updateById(privateCar);
+ break;
}
try {
Thread.sleep(3000L);
@@ -1013,6 +1020,9 @@
throw new RuntimeException(e);
}
}
+ }else{
+ privateCar.setIsover(1);
+ orderPrivateCarService.updateById(privateCar);
}
}
}
@@ -1033,7 +1043,9 @@
for (int i = 0; i < 5; i++) {
updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
if(updateTrip){
- continue;
+ orderLogistics.setIsover(1);
+ orderLogisticsService.updateById(orderLogistics);
+ break;
}
try {
Thread.sleep(3000L);
@@ -1041,6 +1053,9 @@
throw new RuntimeException(e);
}
}
+ }else{
+ orderLogistics.setIsover(1);
+ orderLogisticsService.updateById(orderLogistics);
}
}
if(Arrays.asList(6, 7, 8, 9).contains(state) && !"COMPLETE".equals(tripStatus)){
@@ -1050,7 +1065,9 @@
for (int i = 0; i < 5; i++) {
updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
if(updateTrip){
- continue;
+ orderLogistics.setIsover(1);
+ orderLogisticsService.updateById(orderLogistics);
+ break;
}
try {
Thread.sleep(3000L);
@@ -1058,6 +1075,9 @@
throw new RuntimeException(e);
}
}
+ }else{
+ orderLogistics.setIsover(1);
+ orderLogisticsService.updateById(orderLogistics);
}
}
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
index 1c4ca41..824bdcf 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
@@ -426,6 +426,11 @@
@TableField("tripId")
private String tripId;
/**
+ * google行程结束标识-是否结束（0=否，1=是）
+ */
+ @TableField("isover")
+ private Integer isover;
+ /**
* 司机预估到达预约单时间
*/
@TableField("estimateArriveTime")
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index df3f0c1..ff84c0e 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -1139,6 +1139,8 @@
for (int i = 0; i < 5; i++) {
updateTrip = fleetEngineUtil.updateTrip("COMPLETE", car.getVehicleId(), null, orderLogistics.getTripId(), null, null, null, null);
if(updateTrip){
+ orderLogistics.setIsover(1);
+ this.updateById(orderLogistics);
break;
}
try {
@@ -1147,6 +1149,9 @@
throw new RuntimeException(e);
}
}
+ }else{
+ orderLogistics.setIsover(1);
+ this.updateById(orderLogistics);
}
//上报行程
boolean reportBillableEvent = fleetEngineUtil.reportBillableEvent(orderLogistics.getTripId());
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
index 018aa98..c1a2a04 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
@@ -453,6 +453,11 @@
@TableField("tripId")
private String tripId;
/**
+ * google行程结束标识-是否结束（0=否，1=是）
+ */
+ @TableField("isover")
+ private Integer isover;
+ /**
* 司机预估到达预约单时间
*/
@TableField("estimateArriveTime")
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 a36fcd4..8ebc021 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
@@ -743,6 +743,8 @@
for (int i = 0; i < 5; i++) {
updateTrip = fleetEngineUtil.updateTrip("COMPLETE", car.getVehicleId(), null, orderPrivateCar.getTripId(), null, null, null, null);
if(updateTrip){
+ orderPrivateCar.setIsover(1);
+ this.updateById(orderPrivateCar);
break;
}
try {
@@ -751,6 +753,9 @@
throw new RuntimeException(e);
}
}
+ }else{
+ orderPrivateCar.setIsover(1);
+ this.updateById(orderPrivateCar);
}
//上报行程
@@ -926,7 +931,7 @@
Date date = new Date();
double d = (null == orderPrivateCar.getMileage() ? 0D : orderPrivateCar.getMileage()) / 1000;//实际公里
double t = ((orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()) / 60000) + 1;//实际时间（不满一分钟按一分钟算）
- double w = ((orderPrivateCar.getStartServiceTime().getTime() - orderPrivateCar.getArriveTime().getTime()) / 60000) + 1;//等待分钟（不满一分钟按一分钟算）
+ double w = ((orderPrivateCar.getStartServiceTime().getTime() - (null == orderPrivateCar.getArriveTime() ? orderPrivateCar.getStartServiceTime() : orderPrivateCar.getArriveTime()).getTime()) / 60000) + 1;//等待分钟（不满一分钟按一分钟算）
double d1 = (d - num2) < 0 ? 0 : d - num2;//超出起步里程的公里
double t1 = (t - num3) < 0 ? 0 : new BigDecimal(t - num3).setScale(0, BigDecimal.ROUND_UP).doubleValue();//超过起步分钟数的时间
double w1 = (w - num6) < 0 ? 0 : new BigDecimal(w - num6).setScale(0, BigDecimal.ROUND_UP).doubleValue();//超出等待时间的时间
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
index d30ee77..d90115d 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -80,12 +80,12 @@
@Scheduled(fixedRate = 1000 * 60 * 5)
public void taskFiveMinute(){
try {
- //处理未支付订单发送短信通知
- orderService.taskSmsSend();
- for (Integer id: driverIds){
- jgPushUtil.push(1, "您的预约订单出行时间就要到了，请尽快前往预约地点接乘客", "DRIVER" + id);
- }
- this.driverIds.clear();
+// //处理未支付订单发送短信通知
+// orderService.taskSmsSend();
+// for (Integer id: driverIds){
+// jgPushUtil.push(1, "您的预约订单出行时间就要到了，请尽快前往预约地点接乘客", "DRIVER" + id);
+// }
+// this.driverIds.clear();
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.7.1