Merge remote-tracking branch 'origin/dev' into dev

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

@@ -80,8 +80,9 @@ public class UserBusinessBiz {
                 userTeamMemberBo.setHeadUrl(appUserDetail==null?"":appUserDetail.getHeadimgurl());
                 userTeamMemberBo.setNickName(appUserDetail==null?"":appUserDetail.getNickname());
             }
-            userTeamMemberBo.setIncome(memberIdAndIncomeMap.get(appUserRelation.getUserId()));
-            totalIncome = totalIncome.add(userTeamMemberBo.getIncome());
+            BigDecimal income=memberIdAndIncomeMap.get(appUserRelation.getUserId())==null?BigDecimal.ZERO:memberIdAndIncomeMap.get(appUserRelation.getUserId());
+            userTeamMemberBo.setIncome(income);
+            totalIncome = totalIncome.add(income);
             userTeamMemberBos.add(userTeamMemberBo);
         }
         userTeamMemberVo.setPageNum(memberPage.getPageNum());

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserBussinessController.java

@@ -41,7 +41,7 @@ public class UserBussinessController {
      public ObjectRestResponse<UserTeamMemberVo> findTeamPage(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, HttpServletRequest request){
          try {
              IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
-             UserTeamMemberVo userTeamMemberVo = businessBiz.findTeamMemberPageByUserId(Integer.valueOf(infoFromToken.getId()), pageNo, pageSize);
+             UserTeamMemberVo userTeamMemberVo = businessBiz.findTeamMemberPageByUserId(270, pageNo, pageSize);
              return ObjectRestResponse.succ(userTeamMemberVo);
          } catch (Exception e) {
            throw new BaseException(e);

ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml

@@ -6,10 +6,10 @@
     <select id="accquireIncomeByMemberIds" resultType="com.github.wxiaoqi.security.admin.bo.UserIncomeBo">
         SELECT DISTINCT
         `source_id`as userId,
-        (( SELECT SUM(commission) FROM `app_user_selling_water` WHERE source_id=ausw.source_id AND `status` = 0 AND
+        IFNULL((( SELECT SUM(commission) FROM `app_user_selling_water` WHERE source_id=ausw.source_id AND `status` = 0 AND
         `waiting` = 1 )
         - ( SELECT SUM(commission) FROM `app_user_selling_water` WHERE source_id=ausw.source_id AND `status` = 1 AND
-        `waiting` = 1 )) as `income`
+        `waiting` = 1 )),0) as `income`
         FROM
         `app_user_selling_water` as ausw
         WHERE
@@ -23,7 +23,7 @@
         SELECT
 	( auswu.upIncome - auswd.dowIncome ) AS `income`
 FROM
-	( SELECT SUM( commission ) AS upIncome FROM `app_user_selling_water` WHERE STATUS = 0 AND `user_id` = #{userId}  ) AS `auswu`,
-	( SELECT SUM( commission ) AS `dowIncome` FROM `app_user_selling_water` WHERE STATUS = 1 AND `user_id` = #{userId}  ) AS `auswd`;
+	( SELECT IFNULL(SUM( commission ),0) AS upIncome FROM `app_user_selling_water` WHERE STATUS = 0 AND `user_id` = #{userId}  ) AS `auswu`,
+	( SELECT IFNULL(SUM( commission ),0) AS `dowIncome` FROM `app_user_selling_water` WHERE STATUS = 1 AND `user_id` = #{userId}  ) AS `auswd`;
     </select>
 </mapper>
\ No newline at end of file