From f08b7e95bc941a72d4a7b7bc64c2086ed53f1565 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 21 十月 2024 15:48:27 +0800
Subject: [PATCH] 修改2.0 bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 188 +++++++++++++++++++++++++++++++++-------------
1 files changed, 134 insertions(+), 54 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 683f1fa..736a375 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -18,6 +18,7 @@
import com.stylefeng.guns.modular.system.util.GoogleMap.DistancematrixVo;
import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil;
import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
+import com.stylefeng.guns.modular.system.util.GoogleMap.ReverseGeocodeVo;
import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils;
import com.stylefeng.guns.modular.system.util.quartz.QuartzUtil;
import com.stylefeng.guns.modular.system.util.quartz.jobs.OrderTimeOutJob;
@@ -192,9 +193,10 @@
orderLogistics.setTripId(UUIDUtil.getRandomCode());
}
String value = redisUtil.getValue("DRIVER" + driver.getId());
+ String tripId = redisUtil.getValue("trip" + orderLogistics.getUserId());
if(ToolUtil.isNotEmpty(value)) {
String[] split = value.split(",");
- DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]));
+ DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]), tripId);
//超时时间
long timeOut = System.currentTimeMillis() + (distancematrix.getDuration() * 1000);
orderLogistics.setEstimateArriveTime(new Date(timeOut));
@@ -252,27 +254,63 @@
}
new Thread(()->{
- try {
- Car car = carService.selectById(orderLogistics.getCarId());
- if(!StringUtils.hasLength(car.getVehicleId())){
- car.setVehicleId(UUIDUtil.getRandomCode());
- carService.updateById(car);
- }
- String trip = fleetEngineUtil.getTrip(orderLogistics.getTripId());
- if(ToolUtil.isEmpty(trip)){
- String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
- if(ToolUtil.isEmpty(vehicles)){
- CarModel carModel = carModelMapper.selectById(car.getCarModelId());
- fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ Car car = carService.selectById(orderLogistics.getCarId());
+ if(!StringUtils.hasLength(car.getVehicleId())){
+ car.setVehicleId(UUIDUtil.getRandomCode());
+ carService.updateById(car);
+ }
+ String trip = fleetEngineUtil.getTrip(orderLogistics.getTripId());
+ if(ToolUtil.isEmpty(trip)){
+ String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
+ if(ToolUtil.isEmpty(vehicles)){
+ CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+ boolean createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ if(!createVehicles){
+ for (int i = 0; i < 5; i++) {
+ createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
+ if(createVehicles){
+ break;
+ }
+ try {
+ Thread.sleep(5000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
- fleetEngineUtil.createTrip(car.getVehicleId(), 1, orderLogistics.getTripId(),
- orderLogistics.getStartLat().toString(), orderLogistics.getStartLon().toString(), orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
- }else{
- //开始修改行程数据
- fleetEngineUtil.updateTrip(null, car.getVehicleId(), null, orderLogistics.getTripId(), null, null, null, null);
}
- }catch (Exception e){
- e.printStackTrace();
+ boolean createTrip = fleetEngineUtil.createTrip(car.getVehicleId(), 1, orderLogistics.getTripId(),
+ orderLogistics.getStartLat().toString(), orderLogistics.getStartLon().toString(), orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
+ if(!createTrip){
+ for (int i = 0; i < 5; i++) {
+ createTrip = fleetEngineUtil.createTrip(car.getVehicleId(), 1, orderLogistics.getTripId(),
+ orderLogistics.getStartLat().toString(), orderLogistics.getStartLon().toString(), orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
+ if(createTrip){
+ break;
+ }
+ try {
+ Thread.sleep(5000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }else{
+ //开始修改行程数据
+ boolean updateTrip = fleetEngineUtil.updateTrip(null, car.getVehicleId(), null, orderLogistics.getTripId(), null, null, null, null);
+ if(!updateTrip){
+ for (int i = 0; i < 5; i++) {
+ updateTrip = fleetEngineUtil.updateTrip(null, car.getVehicleId(), null, orderLogistics.getTripId(), null, null, null, null);
+ if(updateTrip){
+ break;
+ }
+ try {
+ Thread.sleep(5000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
}
}).start();
@@ -284,12 +322,12 @@
pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
}
}).start();
-
+ Integer language1 = userInfoMapper.selectById(orderLogistics.getUserId()).getLanguage();
systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得包裹订单，请及时联系客户！" :
language == 2 ? "You have grabbed the delivery order, please contact the client timely."
: "Vous avez saisi la commande du livraison. Veuillez contacter le client en temps opportun.", orderLogistics.getDriverId());
- systemNoticeService.addSystemNotice(1, language == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
- language == 2 ? "Your order has been assigned to the driver- " + driver.getFirstName() + ", please keep your line on."
+ systemNoticeService.addSystemNotice(1, language1 == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
+ language1 == 2 ? "Your order has been assigned to the driver- " + driver.getFirstName() + ", please keep your line on."
: "Votre commande a été attribuée au chauffeur- " + driver.getFirstName() + ", S'il vous plaît, restez en ligne.", orderLogistics.getUserId());
return ResultUtil.success();
}
@@ -326,6 +364,7 @@
long timeOutCancel = orderLogistics.getEstimateArriveTime().getTime() + driverTimeout;
map.put("timeOutCancel", timeOutCancel);
}
+ map.put("isDispute", orderLogistics.getIsDispute());
return map;
}
@@ -345,13 +384,21 @@
* @param state
* @param lon
* @param lat
- * @param address
* @return
* @throws Exception
*/
@Override
- public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address, String pickUpCode, Integer language) throws Exception {
+ public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String pickUpCode, Integer language, Integer uid) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
+ String tripId = redisUtil.getValue("trip" + orderLogistics.getUserId());
+ ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lon, tripId);
+ if(null == reverseGeocode){
+ return ResultUtil.error(language == 1 ? "无效的经纬度" : language == 2 ? "Invalid longitude and latitude" : "Longitude et latitude non valides");
+ }
+ String address = reverseGeocode.getAddress();
+ if(!uid.equals(orderLogistics.getDriverId())){
+ return ResultUtil.error(language == 1 ? "操作失败，请刷新订单" : language == 2 ? "Operation failed, please refresh the order" : "L’opération a échoué, veuillez actualiser la commande");
+ }
if(orderLogistics.getState().compareTo(state) == 0){
return ResultUtil.error(language == 1 ? "不能重复操作" : language == 2 ? "Unable to recur operate" : "Impossible de récurrence des opérer");
}
@@ -363,21 +410,21 @@
}
List<OrderLogisticsSpread> orderLogisticsId = spreadService.selectList(new EntityWrapper<OrderLogisticsSpread>().eq("orderLogisticsId", orderLogistics.getId()).eq("payType",4));
-
+ Integer language1 = userInfoMapper.selectById(orderLogistics.getUserId()).getLanguage();
String tripStatus = "UNKNOWN_TRIP_STATUS";
switch (state){
case 3://出发前往预约点
orderLogistics.setState(3);
orderLogistics.setSetOutTime(new Date());
- systemNoticeService.addSystemNotice(1, language == 1 ? "司机已出发，请耐心等待" : language == 2 ? "The driver is on the way, please wait." : "Le chauffeur est en route. Veuillez patienter.", orderLogistics.getUserId());
+ systemNoticeService.addSystemNotice(1, language1 == 1 ? "司机已出发，请耐心等待" : language1 == 2 ? "The driver is on the way, please wait." : "Le chauffeur est en route. Veuillez patienter.", orderLogistics.getUserId());
pushUtil.pushDriverPosition(orderId, 4);
tripStatus = "ENROUTE_TO_PICKUP";
break;
case 4://到达预约点，等待客户上车
orderLogistics.setState(4);
orderLogistics.setArriveTime(new Date());
- systemNoticeService.addSystemNotice(1, language == 1 ? "司机已到达您设置的预约地点。" : language == 2 ? "The driver has arrived at the reserved location." : "Le chauffeur est arrivé à l'endroit prévu.", orderLogistics.getUserId());
+ systemNoticeService.addSystemNotice(1, language1 == 1 ? "司机已到达您设置的预约地点。" : language1 == 2 ? "The driver has arrived at the reserved location." : "Le chauffeur est arrivé à l'endroit prévu.", orderLogistics.getUserId());
tripStatus = "ARRIVED_AT_PICKUP";
break;
case 5://开始服务
@@ -406,10 +453,19 @@
new Thread(()->{
Car car = carMapper.selectById(driver.getCarId());
//修改行程数据
- try {
- fleetEngineUtil.updateTrip(finalTripStatus, car.getVehicleId(), null, orderLogistics.getTripId(), null, null, null, null);
- } catch (Exception e) {
- throw new RuntimeException(e);
+ boolean updateTrip = fleetEngineUtil.updateTrip(finalTripStatus, car.getVehicleId(), null, orderLogistics.getTripId(), null, null, null, null);
+ if(!updateTrip){
+ for (int i = 0; i < 5; i++) {
+ updateTrip = fleetEngineUtil.updateTrip(finalTripStatus, car.getVehicleId(), null, orderLogistics.getTripId(), null, null, null, null);
+ if(updateTrip){
+ break;
+ }
+ try {
+ Thread.sleep(5000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
}).start();
@@ -557,12 +613,12 @@
pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
}
}).start();
-
+ Integer language1 = userInfoMapper.selectById(orderLogistics.getUserId()).getLanguage();
systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得包裹订单，请及时联系客户！" :
language == 2 ? "You have grabbed the delivery order, please contact the client timely."
: "Vous avez saisi la commande du livraison. Veuillez contacter le client en temps opportun.", orderLogistics.getDriverId());
- systemNoticeService.addSystemNotice(1, language == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
- language == 2 ? "Your order has been assigned to the driver- " + driver.getFirstName() + ", please keep your line on."
+ systemNoticeService.addSystemNotice(1, language1 == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
+ language1 == 2 ? "Your order has been assigned to the driver- " + driver.getFirstName() + ", please keep your line on."
: "Votre commande a été attribuée au chauffeur- " + driver.getFirstName() + ", S'il vous plaît, restez en ligne.", orderLogistics.getUserId());
return ResultUtil.success();
@@ -648,15 +704,15 @@
Element email2_user = document.getElementById("email2_user");
email2_user.text("Bonjour " + userInfo.getFirstName() + " " + userInfo.getLastName());
Element email2_content = document.getElementById("email2_content");
- email2_content.text("Le code de ramassage de votre colis est " + random + ", veuillez effectuer la verification dans les 5minutes.");
+ email2_content.text("Le code de ramassage de votre colis est " + random + ", veuillez effectuer la verification dans les 5 minutes.");
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "取件码邮件" : language == 2 ? "Pickup code" : "Code de ramassage", document.html());
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/home/igotechgh/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
- file = new File("/usr/local/nginx/html/files/html/code_" + orderId + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/code_" + orderId + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -665,7 +721,7 @@
fileWriter.flush();
fileWriter.close();
- String link ="http://182.160.16.251:81/files/html/code_" + orderId + ".html";
+ String link ="https://igo.i-go.group/files/html/code_" + orderId + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(userInfo.getId());
@@ -720,12 +776,21 @@
orderLogistics.setEndLat(Double.valueOf(orderLogistics.getDestinationLat()));
orderLogistics.setEndAddress(orderLogistics.getDestination());
//修改google地图行程终点
- try {
- fleetEngineUtil.updateTrip(null, null, null, orderLogistics.getTripId(),
- null, null, orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException(e);
+ boolean updateTrip = fleetEngineUtil.updateTrip(null, null, null, orderLogistics.getTripId(),
+ null, null, orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
+ if(!updateTrip){
+ for (int i = 0; i < 5; i++) {
+ updateTrip = fleetEngineUtil.updateTrip(null, null, null, orderLogistics.getTripId(),
+ null, null, orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
+ if(updateTrip){
+ break;
+ }
+ try {
+ Thread.sleep(5000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
}
orderLogistics.setDestinationLon("");
@@ -747,6 +812,7 @@
OrderLogistics orderLogistics = this.selectById(orderId);
if(orderLogistics.getState() == 6){//服务中的时候获取实时费用数据
this.setMoney(orderLogistics, 0D, 0D);
+ orderLogistics.setOrderMoney(orderLogistics.getOrderMoney() + orderLogistics.getPriceDifference());
}
Map<String, Object> map = new HashMap<>();
@@ -768,6 +834,7 @@
map.put("discountMoney", orderLogistics.getDiscountMoney());//折扣抵扣金额
map.put("discount", orderLogistics.getDiscount());//折扣
map.put("priceDifference", orderLogistics.getPriceDifference());//补差价
+ map.put("isDispute", orderLogistics.getIsDispute());
return map;
}
@@ -993,10 +1060,13 @@
* @throws Exception
*/
@Override
- public ResultUtil confirmFees(Integer language, Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception {
+ public ResultUtil confirmFees(Integer language, Integer orderId, Integer type, Double parkingFee, Double crossingFee, Integer uid) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
+ if(!uid.equals(orderLogistics.getDriverId())){
+ return ResultUtil.error(language == 1 ? "操作失败，请刷新订单" : language == 2 ? "Operation failed, please refresh the order" : "L’opération a échoué, veuillez actualiser la commande");
+ }
if(6 != orderLogistics.getState()){
- return ResultUtil.error("操作异常，请刷新订单");
+ return ResultUtil.error(language == 1 ? "操作失败，请刷新订单" : language == 2 ? "Operation failed, please refresh the order" : "L’opération a échoué, veuillez actualiser la commande");
}
if(orderLogistics.getArriveTime()==null){
orderLogistics.setArriveTime(orderLogistics.getStartServiceTime());
@@ -1060,7 +1130,9 @@
pushUtil.removeTask(orderId, 4);//删除定时任务，结束推送数据
- systemNoticeService.addSystemNotice(1, language == 1 ? "司机已结束本次行程，谢谢使用" : language == 2 ?
+ UserInfo userInfo = userInfoMapper.selectById(orderLogistics.getUserId());
+ Integer language1 = userInfo.getLanguage();
+ systemNoticeService.addSystemNotice(1, language1 == 1 ? "司机已结束本次行程，谢谢使用" : language1 == 2 ?
"The driver has finished the trip,thank you for using I-GO" : "Le chauffeur a terminé le trajet, merci d'utiliser I-GO", orderLogistics.getUserId());
//回滚司机状态为空闲
@@ -1080,12 +1152,20 @@
//上报google
OrderLogistics finalOrderLogistics = orderLogistics;
new Thread(()->{
- try {
- fleetEngineUtil.reportBillableEvent(finalOrderLogistics.getTripId());
- log.warn("上报时间：{}，tripid：{}，created_at：{}，completed_at：{}", System.currentTimeMillis(), finalOrderLogistics.getTripId(),
- finalOrderLogistics.getInsertTime().getTime(), finalOrderLogistics.getEndServiceTime().getTime());
- }catch (Exception e){
- e.printStackTrace();
+ log.warn("行程结束：{} {}", System.currentTimeMillis(), finalOrderLogistics.getTripId());
+ boolean reportBillableEvent = fleetEngineUtil.reportBillableEvent(finalOrderLogistics.getTripId());
+ if(!reportBillableEvent){
+ for (int i = 0; i < 5; i++) {
+ reportBillableEvent = fleetEngineUtil.reportBillableEvent(finalOrderLogistics.getTripId());
+ if(reportBillableEvent){
+ break;
+ }
+ try {
+ Thread.sleep(5000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
}).start();
return ResultUtil.success();
--
Gitblit v1.7.1