From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 84 ++++++++++++++++++++---------------------
1 files changed, 41 insertions(+), 43 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index dd77f9a..03c3142 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -86,8 +86,10 @@
public List<Map<String, Object>> queryOrderList(Integer language, Integer state, Integer driverId) throws Exception {
List<Map<String, Object>> list = orderTaxiMapper.queryOrderList(state, driverId);
for (Map<String, Object> map : list) {
- String time = map.get("time").toString();
- map.put("time", DateUtil.conversionFormat(language, time));
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
}
return list;
}
@@ -104,8 +106,10 @@
public List<Map<String, Object>> queryMyAllOrder(Integer language, Integer state, Integer uid) throws Exception {
List<Map<String, Object>> list = orderTaxiMapper.queryMyAllOrder(state, uid);
for (Map<String, Object> map : list) {
- String time = map.get("time").toString();
- map.put("time", DateUtil.conversionFormat(language, time));
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
}
return list;
}
@@ -134,8 +138,10 @@
@Override
public Map<String, Object> queryPushOrder(Integer language, Integer orderId) throws Exception {
Map<String, Object> map = orderTaxiMapper.queryPushOrder(orderId);
- String travelTime = map.get("travelTime").toString();
- map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
+ if(null != map.get("travelTime")){
+ String travelTime = map.get("travelTime").toString();
+ map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
+ }
return map;
}
@@ -215,8 +221,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, orderTaxi.getUserId(), orderTaxi.getId(), 2, orderTaxi.getState());
- pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, orderTaxi.getState());
+ pushUtil.pushOrderState(1, orderTaxi.getUserId(), orderTaxi.getId(), 2, orderTaxi.getState(), 0, "");
+ pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, orderTaxi.getState(), 0, "");
if(orderTaxi.getType() == 2){
pushUtil.pushFerryOrderState(1, orderTaxi.getUserId(), orderTaxi.getId(), 2, 2);
System.err.println("----------------------------------推送摆渡订单-----------------------------");
@@ -224,12 +230,6 @@
}
}).start();
- new Thread(new Runnable() {
- @Override
- public void run() {
- pushUtil.pushDriverPosition(orderId, 2);
- }
- }).start();
systemNoticeService.addSystemNotice(2, "您已成功抢得出租车订单，请及时联系客户！", orderTaxi.getDriverId());
systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getLastName().substring(0, 1) + "师傅，请保持电话畅通！", orderTaxi.getUserId());
@@ -304,15 +304,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, orderTaxi.getUserId(), orderTaxi.getId(), 2, orderTaxi.getState());
- pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, orderTaxi.getState());
- }
- }).start();
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- pushUtil.pushDriverPosition(orderId, 2);
+ pushUtil.pushOrderState(1, orderTaxi.getUserId(), orderTaxi.getId(), 2, orderTaxi.getState(), 0, "");
+ pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, orderTaxi.getState(), 0, "");
}
}).start();
@@ -335,12 +328,18 @@
@Override
public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
Map<String, Object> map = orderTaxiMapper.queryOrderInfo(orderId);
- String travelTime_ = map.get("travelTime_").toString();
- map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
- String travelTime = map.get("travelTime").toString();
- map.put("travelTime", DateUtil.conversionFormat(language, travelTime));
- String arriveTime = map.get("arriveTime").toString();
- map.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
+ if(null != map.get("travelTime_")){
+ String travelTime_ = map.get("travelTime_").toString();
+ map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ }
+ if(null != map.get("travelTime")){
+ String travelTime = map.get("travelTime").toString();
+ map.put("travelTime", DateUtil.conversionFormat(language, travelTime));
+ }
+ if(null != map.get("arriveTime")){
+ String arriveTime = map.get("arriveTime").toString();
+ map.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
+ }
return map;
}
@@ -360,6 +359,7 @@
orderTaxi.setState(3);
orderTaxi.setSetOutTime(new Date());
systemNoticeService.addSystemNotice(1, "司机已出发，请耐心等待", orderTaxi.getUserId());
+ pushUtil.pushDriverPosition(orderTaxi.getId(), 2);//主动推送司机定位
break;
case 4://到达预约点，等待客户上车
orderTaxi.setState(4);
@@ -373,8 +373,6 @@
orderTaxi.setBoardingTime(new Date());
orderTaxi.setState(5);
orderTaxi.setStartServiceTime(new Date());
-
- pushUtil.pushDriverPosition(orderTaxi.getId(), 2);//主动推送司机定位
break;
case 6://结束服务
orderTaxi.setGetoffLon(lon);
@@ -394,8 +392,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, orderTaxi.getUserId(), orderTaxi.getId(), 2, orderTaxi.getState());
- pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, orderTaxi.getState());
+ pushUtil.pushOrderState(1, orderTaxi.getUserId(), orderTaxi.getId(), 2, orderTaxi.getState(), 0, "");
+ pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, orderTaxi.getState(), 0, "");
}
}).start();
return ResultUtil.success();
@@ -442,8 +440,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
- pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
+ pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState(), 0, "");
+ pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState(), 0, "");
}
}).start();
return ResultUtil.success();
@@ -487,8 +485,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
- pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
+ pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState(), 0, "");
+ pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState(), 0, "");
}
}).start();
//添加定时任务6分钟司机不确认收款自动完成支付（仅车载端），6分钟之内司机无法接单
@@ -529,8 +527,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, orderTaxi1.getUserId(), orderId, 2, 8);
- pushUtil.pushOrderState(2, orderTaxi1.getDriverId(), orderId, 2, 8);
+ pushUtil.pushOrderState(1, orderTaxi1.getUserId(), orderId, 2, 8, 0, "");
+ pushUtil.pushOrderState(2, orderTaxi1.getDriverId(), orderId, 2, 8, 0, "");
}
}).start();
}
@@ -580,8 +578,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
- pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
+ pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState(), 0, "");
+ pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState(), 0, "");
}
}).start();
@@ -623,8 +621,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, orderTaxi1.getUserId(), orderId, 2, 8);
- pushUtil.pushOrderState(2, orderTaxi1.getDriverId(), orderId, 2, 8);
+ pushUtil.pushOrderState(1, orderTaxi1.getUserId(), orderId, 2, 8, 0, "");
+ pushUtil.pushOrderState(2, orderTaxi1.getDriverId(), orderId, 2, 8, 0, "");
}
}).start();
}
--
Gitblit v1.7.1