From bcaa60da8efe309064eb17d767bfa8ab9011fab1 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 15 七月 2026 17:50:17 +0800
Subject: [PATCH] 接单之后还有可能推送END_PUSH标志fix
---
UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 881ad42..b8f24da 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -3634,12 +3634,16 @@
}else {
// 没找到车辆
Thread.sleep(5000);
- ResultUtil refundResult = handlePrivateCarPrepayCancelRefund(orderPrivateCar, "无司机接单", "无司机接单", orderPrivateCar.getUserId());
- if (refundResult == null) {
- orderPrivateCar.setState(10);
- orderPrivateCarMapper.updateById(orderPrivateCar);
+ OrderPrivateCar latestOrder = orderPrivateCarMapper.selectById(orderPrivateCar.getId());
+ if (latestOrder == null || latestOrder.getState() > 1) {
+ return;
}
- pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, 10);
+ ResultUtil refundResult = handlePrivateCarPrepayCancelRefund(latestOrder, "无司机接单", "无司机接单", latestOrder.getUserId());
+ if (refundResult == null) {
+ latestOrder.setState(10);
+ orderPrivateCarMapper.updateById(latestOrder);
+ }
+ pushUtil.pushEndPush(1, latestOrder.getUserId(), latestOrder.getId(), 1, 10);
}
@@ -3853,12 +3857,16 @@
}else {
// 没找到车辆
Thread.sleep(5000);
- ResultUtil refundResult = handlePrivateCarPrepayCancelRefund(orderPrivateCar, "无司机接单", "无司机接单", orderPrivateCar.getUserId());
- if (refundResult == null) {
- orderPrivateCar.setState(10);
- orderPrivateCarMapper.updateById(orderPrivateCar);
+ OrderPrivateCar latestOrder = orderPrivateCarMapper.selectById(orderPrivateCar.getId());
+ if (latestOrder == null || latestOrder.getState() > 1) {
+ return;
}
- pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, 10);
+ ResultUtil refundResult = handlePrivateCarPrepayCancelRefund(latestOrder, "无司机接单", "无司机接单", latestOrder.getUserId());
+ if (refundResult == null) {
+ latestOrder.setState(10);
+ orderPrivateCarMapper.updateById(latestOrder);
+ }
+ pushUtil.pushEndPush(1, latestOrder.getUserId(), latestOrder.getId(), 1, 10);
}
@@ -3909,20 +3917,24 @@
}
}
Thread.sleep(10000);//设置等待时间
- Integer state = orderPrivateCar.getState();
+ OrderPrivateCar latestOrder = orderPrivateCarMapper.selectById(orderPrivateCar.getId());
+ if (latestOrder == null) {
+ return;
+ }
+ Integer state = latestOrder.getState();
if (state > 1) {
orderIds.remove(orderPrivateCar.getId());
return;
}
if (i == querys.size() + 15 && state == 1) {
- pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, 1);
+ pushUtil.pushEndPush(1, latestOrder.getUserId(), latestOrder.getId(), 1, 1);
orderIds.remove(orderPrivateCar.getId());
// 没找到车辆
- ResultUtil refundResult = handlePrivateCarPrepayCancelRefund(orderPrivateCar, "无司机接单", "无司机接单", orderPrivateCar.getUserId());
+ ResultUtil refundResult = handlePrivateCarPrepayCancelRefund(latestOrder, "无司机接单", "无司机接单", latestOrder.getUserId());
if (refundResult == null) {
- orderPrivateCar.setState(10);
- orderPrivateCarMapper.updateById(orderPrivateCar);
+ latestOrder.setState(10);
+ orderPrivateCarMapper.updateById(latestOrder);
}
}
}
--
Gitblit v1.7.1