From b8d9a9cca2e1894ddc8d56576b9bb2ecbee659c4 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 22 四月 2024 19:25:26 +0800
Subject: [PATCH] 新增加功能
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 36125cb..1c14bbf 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -352,7 +352,6 @@
public void run() {
pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0);
pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0);
- pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);
}
}).start();
}
@@ -429,7 +428,6 @@
public void run() {
pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0);
pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0);
- pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);
}
}).start();
}
@@ -654,6 +652,7 @@
orderPrivateCar.setGetoffAddress(address);
orderPrivateCar.setGetoffTime(new Date());
orderPrivateCar.setEndServiceTime(new Date());
+ orderPrivateCar.setCancelMidway(1);
}else{
orderPrivateCar.setState(10);
}
@@ -665,6 +664,7 @@
orderPrivateCar.setGetoffAddress(address);
orderPrivateCar.setGetoffTime(new Date());
orderPrivateCar.setEndServiceTime(new Date());
+ orderPrivateCar.setCancelMidway(1);
}
orderPrivateCar.setOldState(6);
orderPrivateCar.setState(12);
@@ -2572,6 +2572,13 @@
}else{
map.put("receipt", "");
}
+ 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());
+ map.put("timeOutCancel", jsonObject.getIntValue("driverTimeout"));
return map;
}
--
Gitblit v1.7.1