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

无关风月

2024-11-14 3af9c82375df6bd77ae78a5d900c409a895ecd18

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java

@@ -139,7 +139,6 @@
        orderCancelMapper.insert(orderCancel);
        
        //修改行程信息
        try {
            boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", null, null, tOrderLogistics.getTripId(), null, null, null, null);
            if(!updateTrip){
                for (int i = 0; i < 5; i++) {
@@ -147,11 +146,12 @@
                    if(updateTrip){
                        break;
                    }
                    Thread.sleep(5000L);
                }
            }
                try {
                    Thread.sleep(3000L);
        } catch (Exception e) {
            throw new RuntimeException(e);
                    e.printStackTrace();
                }
            }
        }