From e2d01b2009c30173ff8e9f77d5c065f4d38fa49d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 17:56:07 +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/crossCity/server/impl/OrderCrossCityServiceImpl.java | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index e8a6a2e..fba275b 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -155,8 +155,10 @@
public List<Map<String, Object>> queryOrderList(Integer language, Integer state, Integer driverId) throws Exception {
List<Map<String, Object>> list = orderCrossCityMapper.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;
}
@@ -172,8 +174,10 @@
public List<Map<String, Object>> queryMyAllOrder(Integer language, Integer state, Integer uid) throws Exception {
List<Map<String, Object>> list = orderCrossCityMapper.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;
}
@@ -194,12 +198,18 @@
Double serverMoney = 0D;
Double totalMoney = 0D;
for(Map<String, Object> m : order){
- 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 != m.get("travelTime_")){
+ String travelTime_ = m.get("travelTime_").toString();
+ m.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ }
+ if(null != m.get("travelTime")){
+ String travelTime = m.get("travelTime").toString();
+ m.put("travelTime", DateUtil.conversionFormat(language, travelTime));
+ }
+ if(null != m.get("arriveTime")){
+ String arriveTime = m.get("arriveTime").toString();
+ m.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
+ }
num += Integer.valueOf(m.get("peopleNumber").toString());
totalMoney += Double.valueOf(m.get("payMoney").toString());
List<Income> incomes = incomeService.queryData(1, null, 2, Integer.valueOf(m.get("orderId").toString()), 3);
@@ -237,6 +247,7 @@
orderCrossCity.setState(3);
orderCrossCity.setSetOutTime(new Date());
systemNoticeService.addSystemNotice(1, "司机已出发，请耐心等待", orderCrossCity.getUserId());
+ pushUtil.pushDriverPosition(orderCrossCity.getId(), 3);//主动推送司机定位
break;
case 4://到达预约点，等待客户上车
orderCrossCity.setState(4);
@@ -250,8 +261,6 @@
orderCrossCity.setBoardingTime(new Date());
orderCrossCity.setState(5);
orderCrossCity.setStartServiceTime(new Date());
-
- pushUtil.pushDriverPosition(orderCrossCity.getId(), 3);//主动推送司机定位
break;
case 6://结束服务
orderCrossCity.setGetoffLon(lon);
@@ -305,10 +314,14 @@
@Override
public Map<String, Object> queryOrderCrossCityInfo(Integer language, Integer orderId) throws Exception {
Map<String, Object> map = orderCrossCityMapper.queryOrderCrossCityInfo(orderId);
- String travelTime_ = map.get("travelTime_").toString();
- map.put("travelTime_", DateUtil.conversionFormat1(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("arriveTime")){
+ String arriveTime = map.get("arriveTime").toString();
+ map.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
+ }
return map;
}
@@ -601,7 +614,6 @@
public void run() {
pushUtil.pushOrderState(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 3, orderCrossCity.getState());
pushUtil.pushOrderState(2, orderCrossCity.getDriverId(), orderCrossCity.getId(), 3, orderCrossCity.getState());
- pushUtil.pushDriverPosition(orderCrossCity.getId(), 3);
}
}).start();
@@ -738,7 +750,6 @@
public void run() {
pushUtil.pushOrderState(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 3, orderCrossCity.getState());
pushUtil.pushOrderState(2, orderCrossCity.getDriverId(), orderCrossCity.getId(), 3, orderCrossCity.getState());
- pushUtil.pushDriverPosition(orderCrossCity.getId(), 3);
}
}).start();
--
Gitblit v1.7.1