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

无关风月

2024-08-07 57909bfeb70e80689cfe515198e3a30ad3868bb8

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -413,7 +413,7 @@
        if(null == orderTaxi){
            return ResultUtil.error("取消订单失败，订单信息有误");
        }
        if(orderTaxi.getState() > 5 && orderTaxi.getState() != 11){
        if(orderTaxi.getState() > 5 && orderTaxi.getState() != 12){
            return ResultUtil.error("取消订单失败，不合法的操作");
        }
        if(null == orderTaxi.getDriverId()){//没有接单的情况