From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 1cd72cc..c7f3fd9 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -279,6 +279,7 @@
@Override
public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ System.err.println("==========="+orderId);
switch (state){
case 3://出发前往预约点
orderPrivateCar.setState(3);
@@ -307,12 +308,12 @@
orderPrivateCar.setGetoffTime(new Date());
orderPrivateCar.setEndServiceTime(new Date());
- //设置结束的时候的经纬度
- if (orderPrivateCar.getEndLat()!=null){
- orderPrivateCar.setEndLon(lon);
- orderPrivateCar.setEndLat(lat);
- orderPrivateCar.setEndAddress(address);
- }
+// //设置结束的时候的经纬度
+// if (orderPrivateCar.getEndLat()!=null){
+// orderPrivateCar.setEndLon(lon);
+// orderPrivateCar.setEndLat(lat);
+// orderPrivateCar.setEndAddress(address);
+// }
break;
@@ -333,6 +334,17 @@
}).start();
return ResultUtil.success();
}
+ @Override
+ public ResultUtil specail(Integer orderId, Double lon, Double lat, String endAddress) throws Exception {
+ OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ orderPrivateCar.setEndLon(lon);
+ orderPrivateCar.setEndLat(lat);
+ orderPrivateCar.setEndAddress(endAddress);
+
+
+ this.updateById(orderPrivateCar);
+ return ResultUtil.success();
+ }
--
Gitblit v1.7.1