From 656ac293601d6da08d25e892a79604fe3edcd086 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 01 八月 2024 16:04:46 +0800
Subject: [PATCH] 修改2.0 bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 23 ++---------------------
1 files changed, 2 insertions(+), 21 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..1c6223e 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;
}
@@ -1056,8 +1037,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