From 7ddafd65b2363dc4218468d12c798822a6c0cd45 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 12 四月 2025 18:13:22 +0800
Subject: [PATCH] 修改文档bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 16 +++++++++++++++-
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java | 19 ++++++++++---------
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 3 +++
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 1 +
4 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 21a335c..9c535ee 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1590,6 +1590,9 @@
orderPrivateCar.setTravelTime(travelTime);
orderPrivateCar.setOrderType(reservation);
orderPrivateCar.setOrderSource(orderSource);
+ String tripId = redisUtil.getValue("trip" + uid);
+ orderPrivateCar.setTripId(tripId);
+ orderPrivateCar.setIsover(0);
orderPrivateCar.setIsReassign(1);
orderPrivateCar.setIsDelete(1);
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 49509bf..7b2ce2e 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
@@ -400,6 +400,8 @@
orderLogistics.setTravelTime(null == travelTime ? new Date() : travelTime);
orderLogistics.setOrderSource(orderSource);
orderLogistics.setIsDelete(1);
+ orderLogistics.setTripId(tripId);
+ orderLogistics.setIsover(0);
this.insert(orderLogistics);
//添加消息
@@ -778,6 +780,7 @@
orderLogistics.setIsReassign(1);
orderLogistics.setIsDelete(1);
orderLogistics.setTripId(tripId);
+ orderLogistics.setIsover(0);
DistancematrixVo distancematrix1 = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), orderLogistics.getEndLat(), orderLogistics.getEndLon(), tripId);
Long distance1 = distancematrix1.getDistance();
orderLogistics.setEstimatedMileage(new BigDecimal(distance1).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
@@ -970,10 +973,20 @@
dr.getCompanyId() != null && dr.getCompanyId() != 0 ? dr.getCompanyId() : 1));
orderLogistics.setState(2);
orderLogistics.setCarId(dr.getCarId());
- CarService query1 = carServiceMapper.query(1, dr.getCarId());
+ CarService query1 = carServiceMapper.query(4, dr.getCarId());
orderLogistics.setServerCarModelId(query1.getServerCarModelId());
orderLogistics.setSnatchOrderTime(new Date());
+ String value = redisUtil.getValue("DRIVER" + driver1.getId());
+ if(ToolUtil.isNotEmpty(value)) {
+ String[] split = value.split(",");
+ 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));
+ orderLogistics.setEstimateArriveMileage(distancematrix.getDistance());
+ }
+
dr.setState(3);
driverService.updateById(dr);
this.updateById(orderLogistics);
@@ -1029,6 +1042,7 @@
pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, 2, 0, finalAudioUrl);
}
}).start();
+
}
}
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 9bb5161..88656cf 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -374,6 +374,7 @@
orderPrivateCar.setIsReassign(1);
orderPrivateCar.setIsDelete(1);
orderPrivateCar.setTripId(tripId);
+ orderPrivateCar.setIsover(0);
DistancematrixVo distancematrix1 = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), orderPrivateCar.getEndLat(), orderPrivateCar.getEndLon(), tripId);
Long distance1 = distancematrix1.getDistance();
orderPrivateCar.setEstimatedMileage(new BigDecimal(distance1).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
index 6077c3e..8e6bc0a 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
@@ -68,15 +68,15 @@
String englishName = city1.getEnglishName();
String frenchName = city1.getFrenchName();
for (String s : city) {
- if(s.indexOf(chineseName) != -1){
+ if(s.equals(chineseName)){
collect.add(city1.getId());
break;
}
- if(s.indexOf(englishName) != -1){
+ if(s.equals(englishName)){
collect.add(city1.getId());
break;
}
- if(s.indexOf(frenchName) != -1){
+ if(s.equals(frenchName)){
collect.add(city1.getId());
break;
}
@@ -85,6 +85,7 @@
if(collect.size() == 0){
return null;
}
+ System.err.println("城市ids：" + collect);
return companyMapper.query(collect);
}
@@ -98,15 +99,15 @@
String englishName = city1.getEnglishName();
String frenchName = city1.getFrenchName();
for (String s : city) {
- if(s.indexOf(chineseName) != -1){
+ if(s.equals(chineseName)){
collect.add(city1.getId());
break;
}
- if(s.indexOf(englishName) != -1){
+ if(s.equals(englishName)){
collect.add(city1.getId());
break;
}
- if(s.indexOf(frenchName) != -1){
+ if(s.equals(frenchName)){
collect.add(city1.getId());
break;
}
@@ -136,15 +137,15 @@
String englishName = city1.getEnglishName();
String frenchName = city1.getFrenchName();
for (String s : city) {
- if(s.indexOf(chineseName) != -1){
+ if(s.equals(chineseName)){
collect.add(city1.getId());
break;
}
- if(s.indexOf(englishName) != -1){
+ if(s.equals(englishName)){
collect.add(city1.getId());
break;
}
- if(s.indexOf(frenchName) != -1){
+ if(s.equals(frenchName)){
collect.add(city1.getId());
break;
}
--
Gitblit v1.7.1