From 086fd5d2392b9028cf1159aec7cd47ddd1eb4d07 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 八月 2025 22:05:42 +0800
Subject: [PATCH] 修改bug

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index ca61079..b153bdb 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -528,7 +528,7 @@
 				}
 				orderList = orderPrivateCarService.queryOrderInfo2(orderId, 6, null, null);
 				if (orderInfoWarpper.getState() > 1 && orderInfoWarpper.getDriverId() != 0) {
-					String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderInfoWarpper.getDriverId()));
+					String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + String.valueOf(orderInfoWarpper.getDriverId()));
 					if (value == null || value.equals("")) {
 						if (orderList.isEmpty()) {
 							orderList = orderPrivateCarService.queryOrderInfo2(orderId, 5, "0", "0");
@@ -568,6 +568,9 @@
 					if (null == systemPriceCity) {
 						return ResultUtil.error("请先配置价格规则");
 					}
+					if(orderPrivateCar.getServerCarModelId()==null){
+						orderPrivateCar.setServerCarModelId(0);
+					}
 					Map<String, Object> query1 = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId(), systemPriceCity.getId());
 //					System.out.println("参数:" + orderPrivateCar.getCompanyId() + "|" + orderPrivateCar.getServerCarModelId());
 //					System.out.println("query1:" + query1);

--
Gitblit v1.7.1