Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/SuperSav...

puzhibing

2023-08-17 d0c88e9f82a73e225ec04f3f8b533cf1d97028bc

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java

@@ -1178,6 +1178,9 @@
        Driver driver=null;
        OrderTransfer orderTransfer = new OrderTransfer();
        Order order = this.selectById(orderId);
        if(order.getState() > 104){
            return ResultUtil.error("订单不支持转单");
        }
        if(phone!=null && !"".equals(phone)) {
            Integer oldId = order.getDriverId();
            List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("phone", phone));
@@ -1203,9 +1206,7 @@
        }else {
            order.setState(201);
        }
        if(order.getState() > 104){
            return ResultUtil.error("订单不支持转单");
        }

        order.setOldState(order.getState());

        this.updateById(order);