Merge remote-tracking branch 'origin/master'

Pu Zhibing

8 天以前 4041cb7dafbd2fd394b31d95c5e64528b9f91505

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

@@ -135,11 +135,11 @@
    @Override
    public synchronized ResultUtil grabOrder(Integer orderId, Integer uid) throws Exception {
        OrderPrivateCar orderPrivateCar1 = orderPrivateCarService.selectById(orderId);
        if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && orderPrivateCar1.getState() != 1){
        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){
        if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && orderPrivateCar1.getState() == 1&& orderPrivateCar1.getState() == 11){
            orderPrivateCarService.deleteById(orderId);
            OrderTaxi orderTaxi1 = setOrderTaxi(orderPrivateCar1);
            this.insert(orderTaxi1);
@@ -179,8 +179,13 @@
        if(orderTaxi.getState() == 10){
            return ResultUtil.error("订单已取消");
        }
        if(orderTaxi.getState() != 1){
        if(orderTaxi.getState() != 1 && orderTaxi.getState() != 11 ){
            return ResultUtil.error("手速有点慢哦，订单已被抢啦！");
        }

        Integer oldDriverId = null;
        if(orderTaxi.getState()==11){
            oldDriverId= orderTaxi.getDriverId();
        }
        Driver driver = driverService.selectById(uid);
        orderTaxi.setDriverId(uid);
@@ -240,15 +245,25 @@

        //推送相关代码------------------start----------------
        OrderTaxi finalOrderTaxi = orderTaxi;
        Integer finalOldDriverId = oldDriverId;
        new Thread(new Runnable() {
            @Override
            public void run() {
                pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
                pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
                if(finalOrderTaxi.getType() == 2){
                    pushUtil.pushFerryOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, 2);
                    System.err.println("----------------------------------推送摆渡订单-----------------------------");
                if(finalOldDriverId !=null){
                    // 推送3个 1推送原司机 2推送新司机 3推送用户
                    pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
                    pushUtil.pushOrderReassign(finalOrderTaxi.getUserId(),1 , finalOrderTaxi.getId(), 2);
                    pushUtil.pushOrderReassign(finalOldDriverId,2, finalOrderTaxi.getId(), 2);

                }else {
                    pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
                    pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
                    if(finalOrderTaxi.getType() == 2){
                        pushUtil.pushFerryOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, 2);
                        System.err.println("----------------------------------推送摆渡订单-----------------------------");
                    }
                }

            }
        }).start();