diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/controller/ManageUserController.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/controller/ManageUserController.java index 6f943c1..cf3f6fd 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/controller/ManageUserController.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/controller/ManageUserController.java @@ -80,11 +80,11 @@ public class ManageUserController { } - @GetMapping("/summaryOfPendingPayments") + @PostMapping("/summaryOfPendingPayments") @ApiOperation(value = "管理系统:用户待支付汇总") @RequiresLogin @RequiresRoles(value = {"back_admin","admin"}, logical = Logical.OR) - public R> summaryOfPendingPayments(){ - return manageUserService.summaryOfPendingPayments(); + public TableDataInfo summaryOfPendingPayments(@RequestBody PageVo pageVo){ + return manageUserService.summaryOfPendingPayments(pageVo); } } diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageUserService.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageUserService.java index e46f2aa..05a7d24 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageUserService.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageUserService.java @@ -67,5 +67,5 @@ public interface ManageUserService{ * @param coinVo * @return */ - R> summaryOfPendingPayments(); + TableDataInfo summaryOfPendingPayments(PageVo pageVo); } diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java index 12bbaf0..0160728 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java @@ -245,7 +245,8 @@ public class ManageUserServiceImpl implements ManageUserService { } @Override - public R> summaryOfPendingPayments() { + public TableDataInfo summaryOfPendingPayments(PageVo pageVo) { + PageHelper.startPage(pageVo.getPageNum(), pageVo.getPageSize()); List summaryOfPendingPaymentsList = manageWalletOutInMapper.summaryOfPendingPayments(); System.out.println("起付额:"+summaryOfPendingPaymentsList); //查询起付额 @@ -261,12 +262,21 @@ public class ManageUserServiceImpl implements ManageUserService { // 遍历第一个集合,根据 user 和 coin 从 Map 中查找对应的 startPayAmount 并填充 for (SummaryOfPendingPaymentsDto dto : summaryOfPendingPaymentsList) { String key = dto.getUser() + "_" + dto.getCoin(); - if (startPayAmountMap.containsKey(key)) { - dto.setStartPayAmount(startPayAmountMap.get(key)); - }else{ - dto.setStartPayAmount(BigDecimal.ZERO); - } + dto.setStartPayAmount(startPayAmountMap.getOrDefault(key, BigDecimal.ZERO)); } - return R.success(summaryOfPendingPaymentsList); + return getPageData(summaryOfPendingPaymentsList); + } + + private TableDataInfo getPageData(List list) + { + TableDataInfo rspData = new TableDataInfo<>(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setRows(list); + rspData.setMsg("查询成功"); + PageInfo pageInfo = new PageInfo<>(list); + rspData.setTotal(pageInfo.getTotal()); + rspData.setTotalPage(pageInfo.getPages()); + PageHelper.clearPage(); + return rspData; } } diff --git a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageWalletOutInMapper.xml b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageWalletOutInMapper.xml index 13386f7..7eb6dcc 100644 --- a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageWalletOutInMapper.xml +++ b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageWalletOutInMapper.xml @@ -45,6 +45,6 @@