From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 49 +++++++++++++++++++++++--------------------------
1 files changed, 23 insertions(+), 26 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 686e915..35411eb 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
@@ -198,17 +198,17 @@
Double serverMoney = 0D;
Double totalMoney = 0D;
for(Map<String, Object> m : order){
- if(null != map.get("travelTime_")){
- String travelTime_ = map.get("travelTime_").toString();
- map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ if(null != m.get("travelTime_")){
+ String travelTime_ = m.get("travelTime_").toString();
+ m.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 != m.get("travelTime")){
+ String travelTime = m.get("travelTime").toString();
+ m.put("travelTime", DateUtil.conversionFormat(language, travelTime));
}
- if(null != map.get("arriveTime")){
- String arriveTime = map.get("arriveTime").toString();
- map.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
+ 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());
@@ -247,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);
@@ -260,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);
@@ -298,8 +297,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 2, orderCrossCity.getState());
- pushUtil.pushOrderState(2, orderCrossCity.getDriverId(), orderCrossCity.getId(), 2, orderCrossCity.getState());
+ pushUtil.pushOrderState(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 2, orderCrossCity.getState(), 0, "", "driver");
+ pushUtil.pushOrderState(2, orderCrossCity.getDriverId(), orderCrossCity.getId(), 2, orderCrossCity.getState(), 0, "", "driver");
}
}).start();
return ResultUtil.success();
@@ -475,13 +474,13 @@
orderCrossCity.setTrackId(track);
//调用移动的小号接口
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
- Region region = regionMapper.query(geocode.get("districtCode"));
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
- if(String.valueOf(map.get("code")).equals("200")){
- orderCrossCity.setTelX(map.get("telX"));
- orderCrossCity.setBindId(map.get("bindId"));
- }
+// Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
+// Region region = regionMapper.query(geocode.get("districtCode"));
+// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
+// if(String.valueOf(map.get("code")).equals("200")){
+// orderCrossCity.setTelX(map.get("telX"));
+// orderCrossCity.setBindId(map.get("bindId"));
+// }
if(orderCrossCityWarpper.getTravelMode() == 2){//包车
orderCrossCity.setSeatNumber(lineShiftDriver.getLaveSeatNumber());
orderCrossCity.setPeopleNumber(lineShiftDriver.getLaveSeat());
@@ -613,9 +612,8 @@
new Thread(new Runnable() {
@Override
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);
+ pushUtil.pushOrderState(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0, "", "driver");
+ pushUtil.pushOrderState(2, orderCrossCity.getDriverId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0, "", "driver");
}
}).start();
@@ -750,9 +748,8 @@
new Thread(new Runnable() {
@Override
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);
+ pushUtil.pushOrderState(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0, "", "driver");
+ pushUtil.pushOrderState(2, orderCrossCity.getDriverId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0, "", "driver");
}
}).start();
--
Gitblit v1.7.1