Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-05-06 7c26ec693561ecce9fba31ab4e83e9f30d641aad

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java

@@ -1179,7 +1179,7 @@
     */
    @ResponseBody
    @PostMapping("/api/driver/queryTotalRevenue")
    @ApiOperation(value = "获取收入明细", tags = {"司机端-个人中心"}, notes = "")
    @ApiOperation(value = "获取收入明细【2.0】", tags = {"司机端-个人中心"}, notes = "开发中")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
            @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@@ -1689,4 +1689,32 @@
            return ResultUtil.runErr();
        }
    }
    
    
    
    
    @ResponseBody
    @PostMapping("/api/driver/queryBalanceUsageRecord")
    @ApiOperation(value = "获取余额使用记录【2.0】", tags = {"司机端-个人中心"}, notes = "开发中")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
            @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
            @ApiImplicitParam(value = "体现类型（1=活动收入提现，2=业务收入提现）", name = "type", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<BalanceUsageRecord> queryWithdrawal(Integer language, Integer pageNum, Integer size, Integer type, HttpServletRequest request){
        try {
            Integer uid = driverService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            BalanceUsageRecord withdrawalWarpper1 = new BalanceUsageRecord();
            withdrawalWarpper1.setTotal(0D);
            withdrawalWarpper1.setList(new ArrayList<BalanceUsageRecordList>());
            return ResultUtil.success(withdrawalWarpper1);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }
}