修改bug

Pu Zhibing

2025-04-02 af335bf1ef9104dc62c721e142eca790356d18b6

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

@@ -286,6 +286,8 @@
                for (int i = 0; i < 5; i++) {
                    updateTrip = fleetEngineUtil.updateTrip("COMPLETE", null, null, orderPrivateCar.getTripId(), null, null, null, null);
                    if(updateTrip){
                        orderPrivateCar.setIsover(1);
                        tOrderPrivateCarService.updateById(orderPrivateCar);
                        break;
                    }
                    try {
@@ -294,6 +296,9 @@
                        throw new RuntimeException(e);
                    }
                }
            }else{
                orderPrivateCar.setIsover(1);
                tOrderPrivateCarService.updateById(orderPrivateCar);
            }
            //上报行程
            boolean reportBillableEvent = fleetEngineUtil.reportBillableEvent(orderPrivateCar.getTripId());
@@ -610,7 +615,9 @@
    @ResponseBody
    public Object cancel(@RequestParam Integer tOrderPrivateCarId) {
        TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectById(tOrderPrivateCarId);

        if(Arrays.asList(6, 7, 8, 9, 10).contains(tOrderPrivateCar.getState())){
            return ERROR;
        }
        //修改之前司机状态 -- 空闲
        if(null != tOrderPrivateCar.getDriverId()){
            TDriver driver = tDriverService.selectById(tOrderPrivateCar.getDriverId());
@@ -641,6 +648,8 @@
            for (int i = 0; i < 5; i++) {
                updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tOrderPrivateCar.getTripId(), null, null, null, null);
                if(updateTrip){
                    tOrderPrivateCar.setIsover(1);
                    tOrderPrivateCarService.updateById(tOrderPrivateCar);
                    break;
                }
                try {
@@ -649,6 +658,9 @@
                    throw new RuntimeException(e);
                }
            }
        }else{
            tOrderPrivateCar.setIsover(1);
            tOrderPrivateCarService.updateById(tOrderPrivateCar);
        }