From 7bf07f46d7c39fa01b6d8abd860bd80c210d86cb Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 09 十月 2025 15:48:31 +0800
Subject: [PATCH] 修改上传图片配置
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 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 2c52b37..668d62a 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
@@ -512,6 +512,9 @@
@Override
public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat,String phone, Integer language, Integer uid) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ if((orderPrivateCar.getState() + 1) != state){
+ return ResultUtil.error(language == 1 ? "操作失败，请刷新订单" : language == 2 ? "Operation failed, please refresh the order" : "L’opération a échoué, veuillez actualiser la commande");
+ }
String tripId = redisUtil.getValue("trip" + orderPrivateCar.getUserId());
ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lon, tripId);
if(null == reverseGeocode){
@@ -675,27 +678,20 @@
if(orderPrivateCar.getArriveTime()==null){
orderPrivateCar.setArriveTime(orderPrivateCar.getStartServiceTime());
}
-
- //使用原始里程计算费用
- orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
- Double mileage = orderPrivateCar.getMileage();
- Double orderMoney1 = orderPrivateCar.getOrderMoney();
- //使用预估里程计算费用
+ if(null == orderPrivateCar.getEndServiceTime()){
+ orderPrivateCar.setEndServiceTime(new Date());
+ }
+ //实际里程小于预估里程95%或者大于5%，则使用预估里程进行计算价格
Double startLat = orderPrivateCar.getStartLat();
Double startLon = orderPrivateCar.getStartLon();
Double getoffLon = orderPrivateCar.getGetoffLon();
Double getoffLat = orderPrivateCar.getGetoffLat();
DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(startLat, startLon, getoffLat, getoffLon, orderPrivateCar.getTripId());
- orderPrivateCar.setMileage(distancematrix.getDistance().doubleValue());
- orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);
- Double orderMoney2 = orderPrivateCar.getOrderMoney();
- //如果原始金额小于预估金额，且比例小于95%，则使用预估金额
- if(orderMoney1.compareTo(orderMoney2) >= 0 || orderMoney1 / orderMoney2 >= 0.95){
- //原始金额大于预估金额或者比例大于0.95，则使用原始里程重新计算费用
- orderPrivateCar.setMileage(mileage);
- orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
+ double ce = orderPrivateCar.getMileage() / distancematrix.getDistance().doubleValue();
+ if(ce < 0.95 || ce > 1.05){
+ orderPrivateCar.setMileage(distancematrix.getDistance().doubleValue());
}
-
+ orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
orderPrivateCar.setPayManner(type);
orderPrivateCar.setParkMoney(null == parkingFee ? 0D : parkingFee);
orderPrivateCar.setRoadTollMoney(null == crossingFee ? 0D : crossingFee);
--
Gitblit v1.7.1