修改bug

Pu Zhibing

2025-04-02 af335bf1ef9104dc62c721e142eca790356d18b6

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

@@ -24,6 +24,7 @@
import com.stylefeng.guns.modular.system.service.ITOrderLogisticsService;

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -122,7 +123,9 @@
    @ResponseBody
    public Object cancel(@RequestParam Integer tOrderLogisticsId) {
        TOrderLogistics tOrderLogistics = tOrderLogisticsService.selectById(tOrderLogisticsId);

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