From 2ab5f166d0fad4b1a860fde3bab1adb46d062c3f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 七月 2025 21:18:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 938b103..3b1bb49 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -90,13 +90,14 @@
@Resource
private CarServiceMapper carServiceMapper;
- @Autowired
- private RedisTemplate redisTemplate;
+ @Resource
+ private RedisTemplate<String, Object> redisTemplate;
/**
* 获取司机端首页订单列表
- * @param state 1=服务中，2=待服务（30分钟定义预约）
+ *
+ * @param state 1=服务中，2=待服务（30分钟定义预约）
* @param driverId
* @return
* @throws Exception
@@ -160,7 +161,7 @@
new EntityWrapper<OrderTaxi>()
.eq("type", 2)
.eq("userId", orderPrivateCar.getUserId())
- .ne("state", 1)
+ .notIn("state", 1,11)
.eq("crossCityOrderId", orderPrivateCar.getCrossCityOrderId())
.eq("place", orderPrivateCar.getPlace())
);
@@ -172,7 +173,7 @@
if(orderPrivateCar.getState() == 10){
return ResultUtil.error("订单已取消");
}
- if(orderPrivateCar.getState() != 1){
+ if(orderPrivateCar.getState() != 1 && orderPrivateCar.getState() != 11){
return ResultUtil.error("手速有点慢哦，订单已被抢啦！");
}
Driver driver = driverService.selectById(uid);
--
Gitblit v1.7.1