From 2476fa8ffb259ef8837b66ebcebc82c887315189 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 27 十一月 2024 14:39:57 +0800
Subject: [PATCH] 预约单处理
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 66d8037..062c112 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -428,7 +428,9 @@
// orderPrivateCar.setBindId(map.get("bindId"));
// }
- dr.setState(3);
+ if(orderPrivateCar.getOrderType() != 2){
+ dr.setState(3);
+ }
driverService.updateById(dr);
this.updateById(orderPrivateCar);
@@ -799,7 +801,7 @@
if(list.size() > 0){
// 查询预约单
List<Integer> driverIds = list.stream().map(Driver::getId).collect(Collectors.toList());
- List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryOrderByState(driverIds, 2, 1, 1, 2, 3, 4, 5, 6, 11);
+ List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryOrderByState(driverIds, 2, 1, 2, 3, 4, 5, 6, 11);
double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
list = list.subList(0, lastIndex);//获取空闲司机中占比数据
--
Gitblit v1.7.1