From 7e0384601e24ff67a8f5ea9bfdf692a64a1064d3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 八月 2025 20:47:32 +0800
Subject: [PATCH] 是否包车

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 9b5da04..0140549 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -1896,10 +1896,7 @@
 		if (Integer.valueOf(String.valueOf(map.get("state"))) == 11) {
 			map.put("state", map.get("oldState"));
 		}
-		
-		if (Integer.valueOf(String.valueOf(map.get("state"))) == 7 && (map.get("responsibilityType") == null || Integer.valueOf(String.valueOf(map.get("responsibilityType"))) < 4)) {
-			map.put("appealButton", 1);
-		}
+
 		if (map.get("abnormalIntro") != null) {
 			map.put("appealStatus", 1);
 		}
@@ -1962,7 +1959,7 @@
 		//计算预计距离和剩余时间
 		String value = null;
 		if (null != orderTaxi.getDriverId()) {
-			value = (String) redisTemplate.opsForValue().get("dache_DRIVER" + orderTaxi.getDriverId());
+			value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + orderTaxi.getDriverId());
 			if (null == value || "".equals(value)) {
 				System.err.println("司机没有上传位置信息");
 				
@@ -2346,6 +2343,8 @@
 							break;
 						}
 						if (i == querys.size() + 15 && state == 1) {
+							orderTaxi1.setState(10);
+							orderPrivateCarService.updateById(orderTaxi1);
 							pushUtil.pushEndPush(1, orderTaxi.getUserId(), orderTaxi.getId(), 2);
 							orderIds.remove(orderTaxi.getId());
 						}

--
Gitblit v1.7.1