From 2b769cbc555b57a006b2b3aac3ce92d74a5ba6f2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 14 八月 2025 17:24:35 +0800
Subject: [PATCH] 修改bug

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java |   10 +++++-----
 1 files changed, 5 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 e586502..057776a 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
@@ -170,9 +170,7 @@
 	@Autowired
 	private ITaxiCardService taxiCardService;
 	
-	@Autowired
-	private ITaxiCardPaymentService taxiCardPaymentService;
-	
+
 	@Autowired
 	private IUserUserService userUserService;
 	
@@ -1728,6 +1726,8 @@
 			//添加收入
 			Map<String, Object> map = incomeService.saveIncome(orderTaxi.getId(), 2, orderTaxi.getOrderMoney());
 			orderTaxi.setSplitAllocation(JSON.toJSONString(map));
+
+			promotion(orderTaxi.getId());
 			
 			// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
 			new Thread(new Runnable() {
@@ -1959,7 +1959,7 @@
 		//计算预计距离和剩余时间
 		String value = null;
 		if (null != orderTaxi.getDriverId()) {
-			value = (String) redisTemplate.opsForValue().get("DRIVER" + orderTaxi.getDriverId());
+			value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + orderTaxi.getDriverId());
 			if (null == value || "".equals(value)) {
 				System.err.println("司机没有上传位置信息");
 				
@@ -2337,7 +2337,7 @@
 							}
 						}
 						Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
-						OrderTaxi orderTaxi1 = OrderTaxiServiceImpl.this.selectById(orderTaxi.getId());
+						OrderPrivateCar orderTaxi1 = orderPrivateCarService.selectById(orderTaxi.getId());
 						Integer state = orderTaxi1.getState();
 						if (state != 1) {
 							break;

--
Gitblit v1.7.1