update 后台管理新增定时任务开关，收益入库定时任务修改。新增用户待支付汇总 接口

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<List<SummaryOfPendingPaymentsDto>> summaryOfPendingPayments(){
+    public TableDataInfo<SummaryOfPendingPaymentsDto> summaryOfPendingPayments(@RequestBody PageVo pageVo){
-        return manageUserService.summaryOfPendingPayments();
+        return manageUserService.summaryOfPendingPayments(pageVo);
     }
 }

m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageUserService.java

@@ -67,5 +67,5 @@ public interface ManageUserService{
      * @param coinVo
      * @return
      */
-    R<List<SummaryOfPendingPaymentsDto>> summaryOfPendingPayments();
+    TableDataInfo<SummaryOfPendingPaymentsDto> summaryOfPendingPayments(PageVo pageVo);
 }

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<List<SummaryOfPendingPaymentsDto>> summaryOfPendingPayments() {
+    public TableDataInfo<SummaryOfPendingPaymentsDto> summaryOfPendingPayments(PageVo pageVo) {
+        PageHelper.startPage(pageVo.getPageNum(), pageVo.getPageSize());
         List<SummaryOfPendingPaymentsDto> 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.getOrDefault(key, BigDecimal.ZERO));
-                dto.setStartPayAmount(startPayAmountMap.get(key));
-            }else{
-                dto.setStartPayAmount(BigDecimal.ZERO);
-            }
         }
-        return R.success(summaryOfPendingPaymentsList);
+        return getPageData(summaryOfPendingPaymentsList);
+    }
+
+    private TableDataInfo<SummaryOfPendingPaymentsDto> getPageData(List<SummaryOfPendingPaymentsDto> list)
+    {
+        TableDataInfo<SummaryOfPendingPaymentsDto> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setRows(list);
+        rspData.setMsg("查询成功");
+        PageInfo<SummaryOfPendingPaymentsDto> pageInfo = new PageInfo<>(list);
+        rspData.setTotal(pageInfo.getTotal());
+        rspData.setTotalPage(pageInfo.getPages());
+        PageHelper.clearPage();
+        return rspData;
     }
 }

m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageWalletOutInMapper.xml

@@ -45,6 +45,6 @@
         </where>
     </select>
     <select id="summaryOfPendingPayments" resultType="com.m2pool.manage.dto.SummaryOfPendingPaymentsDto">
-        select coin, max(max_height) as maxHeight, max(should_out_date) AS shouldOutDate, `user`, sum(amount) as needPayAmount from wallet_in where state = 2 group by coin,`user`;
+        select coin, max(max_height) as maxHeight, max(should_out_date) AS shouldOutDate, `user`, sum(amount) as needPayAmount from wallet_in where state = 2 group by coin,`user`
     </select>
 </mapper>