修改bug

Pu Zhibing

12 小时以前 d6a14beb93cb572247db0edff3f25f99e217fcf1

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

@@ -144,23 +144,27 @@
     */
    @Override
    public ResultUtil grabOrder(Integer orderId, Integer uid) throws Exception {
        OrderPrivateCar orderPrivateCar1 = orderPrivateCarService.selectById(orderId);
        if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && orderPrivateCar1.getState() != 1&& orderPrivateCar1.getState() != 11){
            return ResultUtil.error("订单已被抢了");
        }
        OrderTaxi orderTaxi = null;
        if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && (orderPrivateCar1.getState() == 1||  orderPrivateCar1.getState() == 11)){
            orderPrivateCarService.deleteById(orderId);
            OrderTaxi orderTaxi1 = setOrderTaxi(orderPrivateCar1);
            this.insert(orderTaxi1);
            orderTaxi = orderTaxi1;
        OrderTaxi orderTaxi = this.selectById(orderId);
        if(null != orderTaxi && orderTaxi.getType() == 2){
            if(orderTaxi.getState() != 1){
                return ResultUtil.error("订单已被抢了");
            }
        }else{
            orderTaxi = this.selectById(orderId);
            OrderPrivateCar orderPrivateCar1 = orderPrivateCarService.selectById(orderId);
            if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && orderPrivateCar1.getState() != 1&& orderPrivateCar1.getState() != 11){
                return ResultUtil.error("订单已被抢了");
            }
            orderTaxi = null;
            if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && (orderPrivateCar1.getState() == 1||  orderPrivateCar1.getState() == 11)){
                orderPrivateCarService.deleteById(orderId);
                OrderTaxi orderTaxi1 = setOrderTaxi(orderPrivateCar1);
                this.insert(orderTaxi1);
                orderTaxi = orderTaxi1;
            }
        }
        if(null == orderTaxi){
            return ResultUtil.error("订单已被抢了");
        }


        //处理摆渡车的情况
        if(orderTaxi.getType() == 2){