佣金明细

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/SellingWaterVo.java

@@ -47,6 +47,8 @@ public class SellingWaterVo {
 
     @ApiModelProperty(value = "更新时间", hidden = true )
     private Integer updTime;
+
+    private Integer waiting;
     /**
      * 所获佣金
      */

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

@@ -264,8 +264,8 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper,Ap
             totalIncome = total.subtract(refund);
         }
 
-        sellingWaterPagVo.setPageNum(appUserSellingWaterPageDataVO.getPageNum());
-        sellingWaterPagVo.setPageSize(appUserSellingWaterPageDataVO.getPageSize());
+        sellingWaterPagVo.setPageNum(pageNo);
+        sellingWaterPagVo.setPageSize(pageSize);
         sellingWaterPagVo.setTotalCount(appUserSellingWaterPageDataVO.getTotalCount().intValue());
         sellingWaterPagVo.setTotalPage(appUserSellingWaterPageDataVO.getTotalPage());
         sellingWaterPagVo.setTotalIncome(totalIncome);