From 6c0d8fb2db64b8982c4162c7527e72841547110b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 十二月 2024 15:28:50 +0800
Subject: [PATCH] 修改推单规则
---
UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 10 ++++++++--
UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 53b4e72..3cc8479 100644
--- a/UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -847,7 +847,7 @@
//找出距离最近且评分最高的司机
Double dis = 100000D;
- Double pf = 0d;
+ Double pf = -1d;
Driver driver1 = null;
for(Driver driver : drivers){
List<OrderCrossCity> orderCrossCities = crossCityService.selectList(new EntityWrapper<OrderCrossCity>().eq("state", 2).eq("driverId", driver.getId()));
@@ -864,10 +864,16 @@
if(fraction > 0){
fraction = fraction / evaluates.size();
}
- if(dis > d && fraction > pf){
+ if(dis > d){
dis = d;
pf = fraction;
driver1 = driver;
+ }else if(dis == d){
+ if(fraction > pf){
+ dis = d;
+ pf = fraction;
+ driver1 = driver;
+ }
}
}
}
diff --git a/UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
index f283d43..ecdd12a 100644
--- a/UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
+++ b/UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -26,7 +26,7 @@
private RedisUtil redisUtil;
- @Scheduled(fixedRate = 1000 * 10)
+ @Scheduled(fixedRate = 1000 * 5)
public void taskFiveSeconds(){
try {
//定时任务推送订单给司机
--
Gitblit v1.7.1