From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index b51a178..5ade0de 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -47,6 +47,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
@@ -690,25 +691,29 @@
orderLogistics.setIsReassign(1);
orderLogistics.setIsDelete(1);
+ orderLogistics.setTripId(UUIDUtil.getRandomCode());
this.insert(orderLogistics);
- Integer vehicleId = null;
+ String vehicleId = null;
if(null != orderLogistics.getDriverId()){
Driver driver = driverService.selectById(orderLogistics.getDriverId());
- vehicleId = driver.getCarId();
+ Car car = carMapper.selectById(driver.getCarId());
+ if(!StringUtils.hasLength(car.getVehicleId())){
+ car.setVehicleId(UUIDUtil.getRandomCode());
+ carMapper.updateById(car);
+ }
//查询车辆信息，没有则创建信息
- String vehicles = fleetEngineUtil.getVehicles(vehicleId);
+ String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
if(ToolUtil.isEmpty(vehicles)){
- Car car = carService.selectById(vehicleId);
CarModel carModel = carModelMapper.selectById(car.getCarModelId());
- fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), driver.getCarId());
- fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), driver.getCarId());
+ fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
}
}
//创建行程数据
- fleetEngineUtil.createTrip(vehicleId, 1, 4, orderLogistics.getId(),
+ fleetEngineUtil.createTrip(vehicleId, 1, orderLogistics.getTripId(),
orderLogistics.getStartLat().toString(), orderLogistics.getStartLon().toString(), orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
@@ -831,6 +836,7 @@
BaseWarpper baseWarpper = new BaseWarpper();
baseWarpper.setState(orderLogistics.getState());
baseWarpper.setId(orderLogistics.getId());
+ baseWarpper.setContent(orderLogistics.getTripId());
return ResultUtil.success(baseWarpper);
}
@@ -2563,7 +2569,7 @@
}
//修改行程信息
- fleetEngineUtil.updateTrip("CANCELED", null, null, 4, orderLogistics.getId(), null, null, null, null);
+ fleetEngineUtil.updateTrip("CANCELED", null, null, orderLogistics.getTripId(), null, null, null, null);
//添加消息
systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消包裹订单，谢谢使用！" : language == 2 ? "You've cancelled the delivery order successfully, thank you for using I-GO "
--
Gitblit v1.7.1