igo出行
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Pu Zhibing
6 天以前 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc 
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java


@@ -1050,8 +1050,8 @@


        new Thread(new Runnable() {


            @Override


            public void run() {


                pushUtil.pushOrderState(1, finalUserId, orderId, orderType, finalState, 0, "");


                pushUtil.pushOrderState(2, finalDriverId, orderId, orderType, finalState, 0, "");


                pushUtil.pushOrderState(1, finalUserId, orderId, orderType, finalState, 0, "", "driver");


                pushUtil.pushOrderState(2, finalDriverId, orderId, orderType, finalState, 0, "", "driver");


            }


        }).start();


        return ResultUtil.success();


@@ -1304,12 +1304,12 @@


    @Override


    public void overGoogleOrder() {


        List<OrderPrivateCar> privateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().isNotNull("tripId")


                .eq("isover", 0).in("state", Arrays.asList(7, 8, 9, 10)).eq("isDelete", 1));


                .eq("isover", 0).in("state", Arrays.asList(6, 7, 8, 9, 10, 12)).eq("isDelete", 1));


        for (OrderPrivateCar privateCar : privateCars) {


            Integer state = privateCar.getState();


            String tripId = privateCar.getTripId();


            String trip = fleetEngineUtil.getTrip(tripId);


            if("" == trip){


            if(null != trip && "" == trip){


                privateCar.setIsover(1);


                orderPrivateCarService.updateById(privateCar);


                continue;


@@ -1320,10 +1320,10 @@


                Car car = carService.selectById(privateCar.getCarId());


                if(Arrays.asList(10, 12).contains(state) && !"CANCELED".equals(tripStatus)){


                    //修改行程信息


                    boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);


                    boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, privateCar.getId(), 1);


                    if(!updateTrip){


                        for (int i = 0; i < 5; i++) {


                            updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);


                            updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, privateCar.getId(), 1);


                            if(updateTrip){


                                privateCar.setIsover(1);


                                orderPrivateCarService.updateById(privateCar);


@@ -1332,7 +1332,7 @@


                            try {


                                Thread.sleep(3000L);


                            } catch (InterruptedException e) {


                                throw new RuntimeException(e);


                                e.printStackTrace();


                            }


                        }


                    }else{


@@ -1342,10 +1342,10 @@


                }


                if(Arrays.asList(6, 7, 8, 9).contains(state) && !"COMPLETE".equals(tripStatus)){


                    //修改行程信息


                    boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);


                    boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, privateCar.getId(), 1);


                    if(!updateTrip){


                        for (int i = 0; i < 5; i++) {


                            updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);


                            updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, privateCar.getId(), 1);


                            if(updateTrip){


                                privateCar.setIsover(1);


                                orderPrivateCarService.updateById(privateCar);


@@ -1354,7 +1354,7 @@


                            try {


                                Thread.sleep(3000L);


                            } catch (InterruptedException e) {


                                throw new RuntimeException(e);


                                e.printStackTrace();


                            }


                        }


                    }else{


@@ -1365,12 +1365,12 @@


            }


        }


        List<OrderLogistics> orderLogisticsList = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().isNotNull("tripId")


                .eq("isover", 0).in("state", Arrays.asList(7, 8, 9, 10)).eq("isDelete", 1));


                .eq("isover", 0).in("state", Arrays.asList(6, 7, 8, 9, 10, 12)).eq("isDelete", 1));


        for (OrderLogistics orderLogistics : orderLogisticsList) {


            Integer state = orderLogistics.getState();


            String tripId = orderLogistics.getTripId();


            String trip = fleetEngineUtil.getTrip(tripId);


            if("" == trip){


            if(null != trip && "" == trip){


                orderLogistics.setIsover(1);


                orderLogisticsService.updateById(orderLogistics);


                continue;


@@ -1381,10 +1381,10 @@


                Car car = carService.selectById(orderLogistics.getCarId());


                if(Arrays.asList(10, 12).contains(state) && !"CANCELED".equals(tripStatus)){


                    //修改行程信息


                    boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);


                    boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, orderLogistics.getId(), 4);


                    if(!updateTrip){


                        for (int i = 0; i < 5; i++) {


                            updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);


                            updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, orderLogistics.getId(), 4);


                            if(updateTrip){


                                orderLogistics.setIsover(1);


                                orderLogisticsService.updateById(orderLogistics);


@@ -1393,7 +1393,7 @@


                            try {


                                Thread.sleep(3000L);


                            } catch (InterruptedException e) {


                                throw new RuntimeException(e);


                                e.printStackTrace();


                            }


                        }


                    }else{


@@ -1403,10 +1403,10 @@


                }


                if(Arrays.asList(6, 7, 8, 9).contains(state) && !"COMPLETE".equals(tripStatus)){


                    //修改行程信息


                    boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);


                    boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, orderLogistics.getId(), 4);


                    if(!updateTrip){


                        for (int i = 0; i < 5; i++) {


                            updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);


                            updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, orderLogistics.getId(), 4);


                            if(updateTrip){


                                orderLogistics.setIsover(1);


                                orderLogisticsService.updateById(orderLogistics);


@@ -1415,7 +1415,7 @@


                            try {


                                Thread.sleep(3000L);


                            } catch (InterruptedException e) {


                                throw new RuntimeException(e);


                                e.printStackTrace();


                            }


                        }


                    }else{