新增加跨城支付

Pu Zhibing

2 天以前 c8d8d2b62f6d6fe7359d26bdd28ae13df69b1439

 DispatchQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

@@ -213,13 +213,17 @@
            @ApiImplicitParam(value = "订单类型（1=专车，2=跨城）", name = "orderType", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil cancelOrder(Integer orderId, Integer orderType){
    public ResultUtil cancelOrder(Integer orderId, Integer orderType, HttpServletRequest request){
        try {
            Integer uid = dispatchService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            if(orderType == 1){//专车
                return orderPrivateCarService.cancelOrder(orderId);
            }
            if(orderType == 2){//跨城
                return orderCrossCityService.cancelOrder(orderId);
                return orderCrossCityService.cancelOrder(orderId, uid);
            }
            return ResultUtil.success();
        }catch (Exception e){
@@ -237,8 +241,12 @@
            @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城）", name = "orderType", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil cancelOrder1(Integer orderId, Integer orderType){
    public ResultUtil cancelOrder1(Integer orderId, Integer orderType, HttpServletRequest request){
        try {
            Integer uid = dispatchService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            if(orderType == 1){//专车
                return orderPrivateCarService.cancelOrder(orderId);
            }
@@ -246,7 +254,7 @@
                return orderTaxiService.cancelOrder(orderId);
            }
            if(orderType == 3){//跨城
                return orderCrossCityService.cancelOrder(orderId);
                return orderCrossCityService.cancelOrder(orderId, uid);
            }
            return ResultUtil.success();
        }catch (Exception e){