From 7c0d083f31217f84ecf4cb8009891a088a099624 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 10 八月 2026 17:17:40 +0800
Subject: [PATCH] 修改bug
---
UserFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/UserFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 3f5a13e..3ba909c 100644
--- a/UserFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -25,6 +25,8 @@
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
@@ -45,6 +47,7 @@
@Service
public class OrderPrivateCarServiceImpl extends ServiceImpl<OrderPrivateCarMapper, OrderPrivateCar> implements IOrderPrivateCarService {
+ private static final Logger log = LoggerFactory.getLogger(OrderPrivateCarServiceImpl.class);
@Resource
private OrderPrivateCarMapper orderPrivateCarMapper;
@@ -635,15 +638,19 @@
integers = JSON.parseArray(vehicle).toJavaList(Integer.class);
}
Company query = companyCityService.query(String.valueOf(orderPrivateCar.getStartLon()), String.valueOf(orderPrivateCar.getStartLat()));//获取起点所属分公司
+ log.info("推单匹配企业：{}, {}", orderPrivateCar.getOrderNum(), query.getName());
List<PushOrder> querys = pushOrderService.querys(null, 1, query.getId());//获取需要推送的次数
+ log.info("推单匹配规则：{}, {}", orderPrivateCar.getOrderNum(), JSON.toJSONString(querys));
for(int i = 1; i <= querys.size(); i++){
PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0);
//获取空闲司机
List<Driver> list = driverService.queryIdleDriver(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
+ log.info("推单匹配空闲司机：{}, {}", orderPrivateCar.getOrderNum(), JSON.toJSONString(list));
if(list.size() > 0){
double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
list = list.subList(0, lastIndex);//获取空闲司机中占比数据
+ log.info("退单司机司机：{}, {}", orderPrivateCar.getOrderNum(), JSON.toJSONString(list));
for(Driver driver : list){//开始进行推送
boolean bo = false;
for(Integer integer : integers){
--
Gitblit v1.7.1