Pu Zhibing
1 天以前 ddf438536267b9c9bb77369cdccce4e67206842a
ManagementGOPOSTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
@@ -144,27 +144,27 @@
        orderCancelMapper.insert(orderCancel);
        
        //修改行程信息
        TCar car = carService.selectById(tOrderLogistics.getCarId());
        //修改行程信息
        boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tOrderLogistics.getTripId(), null, null, null, null, tOrderLogistics.getId(), 4);
        if(!updateTrip){
            for (int i = 0; i < 5; i++) {
                updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tOrderLogistics.getTripId(), null, null, null, null, tOrderLogistics.getId(), 4);
                if(updateTrip){
                    tOrderLogistics.setIsover(1);
                    tOrderLogisticsService.updateById(tOrderLogistics);
                    break;
                }
                try {
                    Thread.sleep(3000L);
                } catch (InterruptedException e) {
                    throw new RuntimeException(e);
                }
            }
        }else{
            tOrderLogistics.setIsover(1);
            tOrderLogisticsService.updateById(tOrderLogistics);
        }
//        TCar car = carService.selectById(tOrderLogistics.getCarId());
//        //修改行程信息
//        boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tOrderLogistics.getTripId(), null, null, null, null, tOrderLogistics.getId(), 4);
//        if(!updateTrip){
//            for (int i = 0; i < 5; i++) {
//                updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tOrderLogistics.getTripId(), null, null, null, null, tOrderLogistics.getId(), 4);
//                if(updateTrip){
//                    tOrderLogistics.setIsover(1);
//                    tOrderLogisticsService.updateById(tOrderLogistics);
//                    break;
//                }
//                try {
//                    Thread.sleep(3000L);
//                } catch (InterruptedException e) {
//                    throw new RuntimeException(e);
//                }
//            }
//        }else{
//            tOrderLogistics.setIsover(1);
//            tOrderLogisticsService.updateById(tOrderLogistics);
//        }
    
    
        //增加推送