From 9063f00db220dd93c94674d394ddbb38f83abd17 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 18 四月 2025 13:50:46 +0800
Subject: [PATCH] 拆分推送服务
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 75 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 21 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 0142c10..eece0eb 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
@@ -362,6 +362,7 @@
if(null != assignOrder){//配置了指派规则才处理
//获取空闲司机
List<Driver> drivers = driverService.queryIdleDriver(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), assignOrder.getDistance(), null);//获取范围内空闲司机
+ List<Integer> driverIds = drivers.stream().map(Driver::getId).collect(Collectors.toList());
if(drivers.size() > 0){//有司机，直接指派给司机
Driver dr = null;
if(drivers.size() > 1){
@@ -370,7 +371,21 @@
Driver driver = null;
int m = 0;
int index = 0;
+ // 查询预约单
+ List<OrderPrivateCar> orderPrivateCarss = orderPrivateCarMapper.queryOrderByState(driverIds, 2, 1, 2, 3, 4, 5, 6, 11);
+ List<Integer> orderPrivateCarDriverIds = orderPrivateCars.stream().map(OrderPrivateCar::getDriverId).collect(Collectors.toList());
for(int j = 0; j < drivers.size(); j++){
+ Driver driver1 = drivers.get(j);
+ // 判断该司机是否有30分钟内预约单
+ long count = orderPrivateCarss.stream().filter(orderPrivateCar1 -> driver1.getId().equals(orderPrivateCar1.getDriverId())
+ && DateUtil.dateToLocalDateTime(orderPrivateCar1.getTravelTime()).minusMinutes(30).isBefore(LocalDateTime.now())
+ && DateUtil.dateToLocalDateTime(orderPrivateCar1.getTravelTime()).isAfter(LocalDateTime.now())).count();
+ if(orderPrivateCar.getOrderType() == 2 && orderPrivateCarDriverIds.contains(driver.getId())){
+ continue;
+ }
+ if(count > 0){
+ continue;
+ }
String value = redisUtil.getValue("DRIVER" + drivers.get(j).getId());
if(null != value){
// Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), value, 0);//计算距离
@@ -403,17 +418,35 @@
}
}
}else{
- dr = drivers.get(0);
+ List<OrderPrivateCar> orderPrivateCarss = orderPrivateCarMapper.queryOrderByState(driverIds, 2, 1, 2, 3, 4, 5, 6, 11);
+ if(orderPrivateCarss.size()==0){
+ dr = drivers.get(0);
+ }
}
- orderPrivateCar.setDriverId(dr.getId());
- orderPrivateCar.setCompanyId(dr.getFranchiseeId() != null && dr.getFranchiseeId() != 0 ? dr.getFranchiseeId() : (
- dr.getCompanyId() != null && dr.getCompanyId() != 0 ? dr.getCompanyId() : 1));
- orderPrivateCar.setState(2);
- orderPrivateCar.setCarId(dr.getCarId());
- CarService query1 = carServiceMapper.query(1, dr.getCarId());
- orderPrivateCar.setServerCarModelId(query1.getServerCarModelId());
- orderPrivateCar.setSnatchOrderTime(new Date());
+ if(Objects.nonNull(dr)){
+ orderPrivateCar.setDriverId(dr.getId());
+ orderPrivateCar.setCompanyId(dr.getFranchiseeId() != null && dr.getFranchiseeId() != 0 ? dr.getFranchiseeId() : (
+ dr.getCompanyId() != null && dr.getCompanyId() != 0 ? dr.getCompanyId() : 1));
+ orderPrivateCar.setState(2);
+ orderPrivateCar.setCarId(dr.getCarId());
+ CarService query1 = carServiceMapper.query(1, dr.getCarId());
+ orderPrivateCar.setServerCarModelId(query1.getServerCarModelId());
+ orderPrivateCar.setSnatchOrderTime(new Date());
+ if(orderPrivateCar.getOrderType() != 2){
+ dr.setState(3);
+ }
+ driverService.updateById(dr);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0);
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0);
+ pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);
+ }
+ }).start();
+ }
+
//调用高德创建轨迹
// String s = gdFalconUtil.selectTerminal(dr.getPhone());
@@ -429,20 +462,10 @@
// orderPrivateCar.setBindId(map.get("bindId"));
// }
- dr.setState(3);
- driverService.updateById(dr);
this.updateById(orderPrivateCar);
//发送短信给司机
// aLiSendSms.sendSms(dr.getPhone(), "SMS_216832951", "{\"" + orderPrivateCar.getStartAddress() + "\"}");
- new Thread(new Runnable() {
- @Override
- public void run() {
- pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0);
- pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0);
- pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);
- }
- }).start();
}
}
}
@@ -801,6 +824,7 @@
// 查询预约单
List<Integer> driverIds = list.stream().map(Driver::getId).collect(Collectors.toList());
List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryOrderByState(driverIds, 2, 1, 2, 3, 4, 5, 6, 11);
+ List<Integer> orderPrivateCarDriverIds = orderPrivateCars.stream().map(OrderPrivateCar::getDriverId).collect(Collectors.toList());
double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
list = list.subList(0, lastIndex);//获取空闲司机中占比数据
@@ -809,6 +833,9 @@
long count = orderPrivateCars.stream().filter(orderPrivateCar1 -> driver.getId().equals(orderPrivateCar1.getDriverId())
&& DateUtil.dateToLocalDateTime(orderPrivateCar1.getTravelTime()).minusMinutes(30).isBefore(LocalDateTime.now())
&& DateUtil.dateToLocalDateTime(orderPrivateCar1.getTravelTime()).isAfter(LocalDateTime.now())).count();
+ if(orderPrivateCar.getOrderType() == 2 && orderPrivateCarDriverIds.contains(driver.getId())){
+ continue;
+ }
if(count > 0){
continue;
}
@@ -1038,10 +1065,16 @@
resultUtil = payMoneyUtil.weixinpay("完成订单",orderId +"", code,orderMoney+"","/base/wxPayOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, orderPrivateCar.getUserId(), 1, orderId, 1, 1, orderMoney, null, 1, code);//添加预支付数据
+ long millis = System.currentTimeMillis();
new Thread(()->{
- long time = orderPrivateCar.getInsertTime().getTime();
+ long time = millis;
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
//订单创建后15分钟
- while (System.currentTimeMillis() - time <= 900000) {
+ while ((System.currentTimeMillis() - time) <= 900000) {
try {
String value1 = redisUtil.getValue(orderId + "_status_1");
if(ToolUtil.isNotEmpty(value1) && "8".equals(value1)){
--
Gitblit v1.7.1