From 5e3dec02d94aeb5c021569b7dfdf894e6641ad82 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 19 八月 2025 11:27:44 +0800
Subject: [PATCH] 合并代码
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
index 56f597a..9d9dda7 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -532,7 +532,10 @@
pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
}else{
//推单
- pushOrder(order.getId());
+ Order finalOrder = order;
+ new Thread(()->{
+ pushOrder(finalOrder.getId());
+ }).start();
}
}
}
@@ -605,7 +608,7 @@
.eq("state", 2).last(" and surplusQuantity > 0 and now() < failureTime"));
Double d = null;
for (YouTuiDriver youTuiDriver : youTuiDrivers) {
- String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
+ String value = redisUtil.getValue("daijia:DRIVER" + youTuiDriver.getDriverId());
if(ToolUtil.isEmpty(value)){
continue;
}
@@ -667,7 +670,7 @@
Double score = null;//评分
Double d = null;
for (Driver driver1 : drivers) {
- String value = redisUtil.getValue("DRIVER" + driver1.getId());
+ String value = redisUtil.getValue("daijia:DRIVER" + driver1.getId());
if(ToolUtil.isEmpty(value)){
continue;
}
@@ -801,7 +804,7 @@
return;
}
for (Driver driver1 : drivers) {
- String value = redisUtil.getValue("DRIVER" + driver1.getId());
+ String value = redisUtil.getValue("daijia:DRIVER" + driver1.getId());
if (ToolUtil.isEmpty(value)) {
continue;
}
@@ -876,7 +879,7 @@
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
orderInfoWarpper.setServiceCell(jsonObject.getString("num1"));
}
- String value = redisUtil.getValue("DRIVER" + orderInfoWarpper.getDriverId());
+ String value = redisUtil.getValue("daijia:DRIVER" + orderInfoWarpper.getDriverId());
if(ToolUtil.isNotEmpty(value)){
String[] split = value.split(",");
orderInfoWarpper.setDriverLon(split[0]);
--
Gitblit v1.7.1