From 57909bfeb70e80689cfe515198e3a30ad3868bb8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 07 八月 2024 09:35:28 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index 838c5be..df60022 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -521,25 +521,6 @@
if(null != map.get("telX")){
map.put("phone", map.get("telX"));
}
- Integer companyId = 1;
- if(null != map.get("driverId")){
- companyId = Integer.valueOf(String.valueOf(map.get("companyId")));
- }
- CancleOrder cancleOrder = cancleOrderService.selectOne(new EntityWrapper<CancleOrder>().eq("companyId", companyId));
- JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());
- int driverTimeout = jsonObject.getIntValue("driverTimeout");
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Integer type = Integer.valueOf(map.get("orderType").toString());
- if(type == 2){
- String travelTime = map.get("travelTime").toString();
- long time = System.currentTimeMillis() - sdf.parse(travelTime).getTime() - (driverTimeout * 60000);
- map.put("timeOutCancel", Double.valueOf(time / 60000).intValue());
- }else{
- String estimateArriveTime = map.get("estimateArriveTime").toString();
- long time = System.currentTimeMillis() - sdf.parse(estimateArriveTime).getTime() - (driverTimeout * 60000);
- map.put("timeOutCancel", Double.valueOf(time / 60000).intValue());
- }
return map;
}
@@ -594,13 +575,13 @@
String address = reverseGeocode.getAddress();
switch (orderType){
case 1://专车
- return orderPrivateCarService.process(orderId, state, lon, lat, address, phone, language);
+ return orderPrivateCarService.process(orderId, state, lon, lat, address, phone, language, uid);
case 2://出租
// return orderTaxiService.process(orderId, state, lon, lat, address);
case 3://城际
// return orderCrossCityService.process(orderId, state, lon, lat, address);
case 4://同城小件
- return orderLogisticsService.process(orderId, state, lon, lat, address, pickUpCode, language);
+ return orderLogisticsService.process(orderId, state, lon, lat, address, pickUpCode, language, uid);
case 5://跨城小件
// return orderLogisticsService.process(orderId, state, lon, lat, address);
case 6:
@@ -622,16 +603,17 @@
* @throws Exception
*/
@Override
- public ResultUtil confirmFees(Integer language, Integer orderId, Integer orderType, Integer type, Double travelFee, Double parkingFee, Double crossingFee) throws Exception {
+ public ResultUtil confirmFees(Integer language, Integer orderId, Integer orderType, Integer type, Double travelFee,
+ Double parkingFee, Double crossingFee, Integer uid) throws Exception {
switch (orderType){
case 1://专车
- return orderPrivateCarService.confirmFees(language, orderId, type, parkingFee, crossingFee);
+ return orderPrivateCarService.confirmFees(language, orderId, type, parkingFee, crossingFee, uid);
case 2://出租
return orderTaxiService.confirmFees(orderId, type, travelFee, parkingFee, crossingFee);
case 3://城际（没有此流程）
break;
case 4://
- return orderLogisticsService.confirmFees(language, orderId, type, parkingFee, crossingFee);
+ return orderLogisticsService.confirmFees(language, orderId, type, parkingFee, crossingFee, uid);
case 5:
break;
case 6:
@@ -1056,8 +1038,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, finalUserId, orderId, orderType, finalState);
- pushUtil.pushOrderState(2, finalDriverId, orderId, orderType, finalState);
+ pushUtil.pushOrderState(1, finalUserId, orderId, orderType, finalState, 0, "");
+ pushUtil.pushOrderState(2, finalDriverId, orderId, orderType, finalState, 0, "");
}
}).start();
return ResultUtil.success();
--
Gitblit v1.7.1