Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

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

@@ -43,10 +43,12 @@ public class SellingWaterVo {
     private BigDecimal price;
 
     @ApiModelProperty(value = "创建时间", hidden = true )
-    private Integer crtTime;
+    private Long crtTime;
 
     @ApiModelProperty(value = "更新时间", hidden = true )
-    private Integer updTime;
+    private Long updTime;
+
+    private Integer waiting;
     /**
      * 所获佣金
      */

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

@@ -231,7 +231,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper,Ap
          Map<Integer,BigDecimal> memberIdAndIncomeMap = new HashMap<>();
          List<UserIncomeBo> userIncomeBos = mapper.accquireIncomeByMemberIds(memberIds);
          if (CollectionUtils.isNotEmpty(userIncomeBos)){
-             memberIdAndIncomeMap = userIncomeBos.stream().collect(Collectors.toMap(UserIncomeBo::getUserId,UserIncomeBo::getIncome));
+             memberIdAndIncomeMap = userIncomeBos.stream().collect(Collectors.toMap(UserIncomeBo::getUserId,userIncomeBo-> userIncomeBo.getIncome()==null?new BigDecimal(0):userIncomeBo.getIncome()));
          }
         return memberIdAndIncomeMap;
     }
@@ -279,8 +279,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);