Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel i...

44323

2024-05-17 e2d01b2009c30173ff8e9f77d5c065f4d38fa49d

 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);
@@ -615,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();

@@ -752,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();