会员统计信息修改

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

@@ -5,10 +5,7 @@ import com.ace.cache.annotation.CacheClear;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.dto.BaseUserMemberVO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
-import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
-import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
-import com.github.wxiaoqi.security.admin.entity.BaseUserMemberExport;
-import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberMapper;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
@@ -35,6 +32,7 @@ import tk.mybatis.mapper.entity.Example;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
@@ -426,14 +424,36 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
        List<BaseUserMemberLevel> newLevelList = userMemberLevelList.stream().filter(p -> p.getIsShare() == 1).collect(Collectors.toList());
         Integer queryLevel = newLevelList.get(0).getLevel() - 2;
         Integer result = level;
-        if (level > queryLevel) {
-            queryLevel = level - 1;
-            result = queryLevel;
-        }
         //需要分成，则查询当前用户的下级是否符合条件，符合条件level+1
         List<BaseUserMember> baseUserMemberList = mapper.selectAllChildrenByLevel(userId, queryLevel);
         if (baseUserMemberList != null && baseUserMemberList.size() >= getLimitNumber()) {
-            return generateUserLevel(userId, level+1, userMemberLevelList);
+            Map<Integer, List<BaseUserMember>> map = baseUserMemberList.stream().collect(Collectors.groupingBy(BaseUserMember::getMemberLevel));
+            if (map.get(3) != null && map.get(3).size() >= getLimitNumber()) {
+                if (level < 5) {
+                    result = 5;
+                }
+            }
+            if (map.get(4) != null && map.get(4).size() >= getLimitNumber()) {
+                if (level < 5) {
+                    result = 5;
+                }
+            }
+            if (map.get(5) != null && map.get(5).size() >= getLimitNumber()) {
+                if (level < 6) {
+                    result = 6;
+                }
+            }
+            if (map.get(6) != null && map.get(6).size() >= getLimitNumber()) {
+                if (level < 7) {
+                    result = 7;
+                }
+            }
+            if (map.get(7) != null && map.get(7).size() >= getLimitNumber()) {
+                if (level < 8) {
+                    result = 8;
+                }
+            }
+            return generateUserLevel(userId, result, userMemberLevelList);
         } else {
             return result;
         }