From f9bbe9855f91b43ecab36fb0ecd2b40388c64fad Mon Sep 17 00:00:00 2001 From: chengkun <2500338766@qq.com> Date: Wed, 13 Jul 2022 14:13:12 +0800 Subject: [PATCH] feature1.0.0-img:fix bug --- .../img/controller/CreatorMiniController.java | 15 +++++++++------ .../java/com/bnyer/img/dto/ProfitStatusDto.java | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java index 4a192bf..4408132 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java @@ -252,8 +252,9 @@ public class CreatorMiniController extends BaseController { //@TokenCheck @ApiOperation(value="查询指定艺术家即将入账收益列表") @PostMapping(value = "/queryFrontPreProfit") - public AjaxResult queryFrontPreProfit(@Validated @RequestBody @ApiParam("即将入账对象") ProfitStatusDto params){ - return AjaxResult.success(creatorProfitService.queryFrontPreProfit(params.getCreatorId(),params.getType())); + public TableDataInfo queryFrontPreProfit(@Validated @RequestBody @ApiParam("即将入账对象") ProfitStatusDto params){ + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + return getDataTable(creatorProfitService.queryFrontPreProfit(params.getCreatorId(),params.getType())); } //@TokenCheck @@ -266,8 +267,9 @@ public class CreatorMiniController extends BaseController { //@TokenCheck @ApiOperation(value="查询指定艺术家已入账收益列表") @PostMapping(value = "/queryFrontInProfitAmt") - public AjaxResult queryFrontInProfitAmt(@Validated @RequestBody @ApiParam("已入账对象") ProfitStatusDto params){ - return AjaxResult.success(creatorProfitService.queryFrontInProfitAmt(params.getCreatorId(),params.getType())); + public TableDataInfo queryFrontInProfitAmt(@Validated @RequestBody @ApiParam("已入账对象") ProfitStatusDto params){ + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + return getDataTable(creatorProfitService.queryFrontInProfitAmt(params.getCreatorId(),params.getType())); } //@TokenCheck @@ -280,8 +282,9 @@ public class CreatorMiniController extends BaseController { //@TokenCheck @ApiOperation(value="查询指定艺术家转入钱包收益列表") @PostMapping(value = "/queryFrontEndProfitAmt") - public AjaxResult queryFrontEndProfitAmt(@Validated @RequestBody @ApiParam("转入钱包对象") ProfitStatusDto params){ - return AjaxResult.success(creatorProfitService.queryFrontEndProfitAmt(params.getCreatorId(),params.getType())); + public TableDataInfo queryFrontEndProfitAmt(@Validated @RequestBody @ApiParam("转入钱包对象") ProfitStatusDto params){ + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + return getDataTable(creatorProfitService.queryFrontEndProfitAmt(params.getCreatorId(),params.getType())); } //@TokenCheck diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitStatusDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitStatusDto.java index 79d0216..7583942 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitStatusDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitStatusDto.java @@ -13,7 +13,7 @@ import java.io.Serializable; @Getter @Setter @ApiModel("入账类型接收类") -public class ProfitStatusDto implements Serializable { +public class ProfitStatusDto extends BasePageDto { @NotNull(message = "艺术家id不能为空!") @ApiModelProperty(value="艺术家id")