From 0f9a91a7609e6623ada0f8b5a9ee878e77e5aa32 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 21 六月 2024 10:01:59 +0800
Subject: [PATCH] 修改google地图对接bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 222bdfa..299f2be 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -20,6 +20,7 @@
import com.stylefeng.guns.modular.system.util.quartz.jobs.OrderTimeOutJob;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
+import org.apache.shiro.util.StringUtils;
import org.quartz.JobDataMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -215,6 +216,9 @@
driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
orderPrivateCar.setState(2);
orderPrivateCar.setSnatchOrderTime(new Date());
+ if(!StringUtils.hasLength(orderPrivateCar.getTripId())){
+ orderPrivateCar.setTripId(UUIDUtil.getRandomCode());
+ }
this.updateById(orderPrivateCar);
//如果是预约单，则不修改司机为服务中
@@ -268,19 +272,23 @@
}
}
- String trip = fleetEngineUtil.getTrip(1, orderPrivateCar.getId());
+ Car car = carService.selectById(orderPrivateCar.getCarId());
+ if(!StringUtils.hasLength(car.getVehicleId())){
+ car.setVehicleId(UUIDUtil.getRandomCode());
+ carService.updateById(car);
+ }
+ String trip = fleetEngineUtil.getTrip(orderPrivateCar.getTripId());
if(ToolUtil.isEmpty(trip)){
- String vehicles = fleetEngineUtil.getVehicles(orderPrivateCar.getCarId());
+ String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
if(ToolUtil.isEmpty(vehicles)){
- Car car = carService.selectById(orderPrivateCar.getCarId());
CarModel carModel = carModelMapper.selectById(car.getCarModelId());
- fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getId());
+ fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
}
- fleetEngineUtil.createTrip(orderPrivateCar.getCarId(), 1, 1, orderPrivateCar.getId(),
+ fleetEngineUtil.createTrip(car.getVehicleId(), 1, orderPrivateCar.getTripId(),
orderPrivateCar.getStartLat().toString(), orderPrivateCar.getStartLon().toString(), orderPrivateCar.getEndLat().toString(), orderPrivateCar.getEndLon().toString());
}
//开始修改行程数据
- fleetEngineUtil.updateTrip(null, driver.getCarId(), null, 1, orderPrivateCar.getId(), null, null, null, null);
+ fleetEngineUtil.updateTrip(null, car.getVehicleId(), null, orderPrivateCar.getTripId(), null, null, null, null);
//推送相关代码------------------start----------------
new Thread(new Runnable() {
@@ -408,7 +416,7 @@
Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
//修改行程数据
- fleetEngineUtil.updateTrip(tripStatus, null, 1, 1, orderPrivateCar.getId(), null, null, null, null);
+ fleetEngineUtil.updateTrip(tripStatus, null, 1, orderPrivateCar.getTripId(), null, null, null, null);
// TODO: 2020/6/5 推送状态
OrderPrivateCar finalOrderPrivateCar = orderPrivateCar;
--
Gitblit v1.7.1