From a1148d2c7f67a40d8bd51f5e2d4563d1dd2ae3b2 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 13 八月 2024 17:49:58 +0800
Subject: [PATCH] 提交代码
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 57 +++++++++++++++++++--------------------------------------
1 files changed, 19 insertions(+), 38 deletions(-)
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 7ddb337..e63703e 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -313,29 +313,6 @@
}
}
}).start();
-// OrderPosition orderPosition = new OrderPosition();
-// orderPosition.setOrderId(orderId);
-// orderPosition.setOrderType(1);
-// orderPosition.setDriverId(orderPrivateCar.getDriverId());
-// orderPosition.setLat(lat.toString());
-// orderPosition.setLon(lon.toString());
-// orderPosition.setAltitude("0");
-// orderPosition.setDirectionAngle("0");
-// //先计算里程，在存储最新位置
-// orderPosition.setInsertTime(new Date());
-// //将数据存储到文件中
-// List<OrderPosition> orderPositions = orderPositionService.queryPosition(orderPosition.getOrderId(), orderPosition.getOrderType());
-// File file = new File(filePath + orderPosition.getOrderId() + "_" + orderPosition.getOrderType() + ".txt");
-// if(!file.exists()){
-// file.getParentFile().mkdirs();
-// file.createNewFile();
-// }
-// //写入相应的文件
-// PrintWriter out = new PrintWriter(new FileWriter(file));
-// orderPositions.add(orderPosition);
-// out.write(JSON.toJSONString(orderPositions));
-// out.flush();
-// out.close();
break;
case 6://结束服务（专车可以返回继续服务）不修改状态
orderPrivateCar.setGetoffLon(lon);
@@ -413,19 +390,20 @@
}
}
System.err.println("======服务里程======"+sum);
- orderPrivateCar.setMileage(sum);
- // 将数据存储到文件中
- File file = new File(filePath + orderId + "_" + 1 + ".txt");
- if(!file.exists()){
- file.getParentFile().mkdirs();
- file.createNewFile();
+ if(counts < 5){
+ orderPrivateCar.setMileage(sum);
+ // 将数据存储到文件中
+ File file = new File(filePath + orderId + "_" + 1 + ".txt");
+ if(!file.exists()){
+ file.getParentFile().mkdirs();
+ file.createNewFile();
+ }
+ //写入相应的文件
+ PrintWriter out = new PrintWriter(new FileWriter(file));
+ out.write(JSON.toJSONString(orderPositions));
+ out.flush();
+ out.close();
}
- //写入相应的文件
- PrintWriter out = new PrintWriter(new FileWriter(file));
- out.write(JSON.toJSONString(orderPositions));
- out.flush();
- out.close();
-
break;
}
this.updateById(orderPrivateCar);
@@ -461,6 +439,9 @@
@Override
public ResultUtil confirmFees(Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ if(orderPrivateCar.getState() != 5){
+ return ResultUtil.error("异常操作，请刷新订单");
+ }
if(orderPrivateCar.getArriveTime()==null){
orderPrivateCar.setArriveTime(orderPrivateCar.getStartServiceTime());
}
@@ -609,10 +590,10 @@
this.updateById(orderPrivateCar);
return true;//第一条数据不作处理，直接存储
}
- Map<String, String> distance = gdMapElectricFenceUtil.getDistance(now, old, 0);//直线距离
+ Map<String, Double> distance = GeodesyUtil.getDistance(now, old);//直线距离
if(null != distance){
- String distance1 = distance.get("distance");
- if(Double.valueOf(distance1) > 50 && orderPrivateCar.getState()==5/* && orderPosition.getInsertTime().getTime()>=orderPrivateCar.getBoardingTime().getTime()*/){//大于50米表示在移动
+ Double distance1 = distance.get("WGS84");
+ if(distance1 > 50 && orderPrivateCar.getState()==5){//大于50米表示在移动
orderPrivateCar.setMileage(new BigDecimal(orderPrivateCar.getMileage()).add(new BigDecimal(distance1)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
this.updateById(orderPrivateCar);
return true;
--
Gitblit v1.7.1