Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-07-23 2ab5f166d0fad4b1a860fde3bab1adb46d062c3f

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -161,7 +161,7 @@
                    new EntityWrapper<OrderTaxi>()
                            .eq("type", 2)
                            .eq("userId", orderPrivateCar.getUserId())
                            .ne("state", 1)
                            .notIn("state", 1,11)
                            .eq("crossCityOrderId", orderPrivateCar.getCrossCityOrderId())
                            .eq("place", orderPrivateCar.getPlace())
            );
@@ -173,7 +173,7 @@
        if(orderPrivateCar.getState() == 10){
            return ResultUtil.error("订单已取消");
        }
        if(orderPrivateCar.getState() != 1){
        if(orderPrivateCar.getState() != 1 && orderPrivateCar.getState() != 11){
            return ResultUtil.error("手速有点慢哦，订单已被抢啦！");
        }
        Driver driver = driverService.selectById(uid);