Pu Zhibing
6 天以前 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -693,7 +693,7 @@
     */
    @ResponseBody
    @PostMapping("/base/order/sendOrderState")
    public ResultUtil cancelOrder(Integer id, Integer orderType){
    public ResultUtil cancelOrder(Integer id, Integer orderType, String from){
        try {
            Integer driverId = null;
            Integer userId = null;
@@ -705,7 +705,7 @@
                    userId = orderPrivateCar.getUserId();
                    state = orderPrivateCar.getState();
                    if(null != driverId){
                        pushUtil.pushOrderState(2, driverId, id, orderType, state, 0, "");
                        pushUtil.pushOrderState(2, driverId, id, orderType, state, 0, "", from);
                    }
                    break;
                case 2:
@@ -714,7 +714,7 @@
                    userId = orderTaxi.getUserId();
                    state = orderTaxi.getState();
                    if(null != driverId){
                        pushUtil.pushOrderState(2, driverId, id, orderType, state, 0, "");
                        pushUtil.pushOrderState(2, driverId, id, orderType, state, 0, "", from);
                    }
                    break;
                case 3:
@@ -725,7 +725,7 @@
                    if(orderCrossCity.getPayMoney() == null && state == 10){//支付的情况才推送取消
                        break;
                    }else{
                        pushUtil.pushOrderState(2, driverId, id, orderType, state, 0, "");
                        pushUtil.pushOrderState(2, driverId, id, orderType, state, 0, "", from);
                    }
                    break;
                case 4:
@@ -736,7 +736,7 @@
                    if(orderLogistics.getPayMoney() == null && state == 10){//支付的情况才推送取消
                        break;
                    }else{
                        pushUtil.pushOrderState(2, driverId, id, orderType, state, 0, "");
                        pushUtil.pushOrderState(2, driverId, id, orderType, state, 0, "", from);
                    }
                    break;
                case 5:
@@ -747,11 +747,11 @@
                    if(orderLogistics1.getPayMoney() == null && state == 10){//支付的情况才推送取消
                        break;
                    }else{
                        pushUtil.pushOrderState(2, driverId, id, orderType, state, 0, "");
                        pushUtil.pushOrderState(2, driverId, id, orderType, state, 0, "", from);
                    }
                    break;
            }
            pushUtil.pushOrderState(1, userId, id, orderType, state, 0, "");
            pushUtil.pushOrderState(1, userId, id, orderType, state, 0, "", from);
            return ResultUtil.success();
        }catch (Exception e){
            e.printStackTrace();