Merge branch 'dev-tiande-member' into dev-tiande

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

@@ -422,9 +422,9 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
         if ( currentLevel.getLevel().equals(userMemberLevelList.get(userMemberLevelList.size() - 1).getLevel()) ) {
                 return currentLevel.getLevel();
         }
-        //如果当前等级小于等于第一个分成等级的低一等级, 则直接查询大于等于第一个分成等级的低一等级的下级用户数量， 否则直接取当前等级的低一级会员数量
+        //如果当前等级小于等于第一个分成等级的低二等级, 则直接查询大于等于第一个分成等级的低一等级的下级用户数量， 否则直接取当前等级的低一级会员数量
        List<BaseUserMemberLevel> newLevelList = userMemberLevelList.stream().filter(p -> p.getIsShare() == 1).collect(Collectors.toList());
-        Integer queryLevel = newLevelList.get(0).getLevel() - 1;
+        Integer queryLevel = newLevelList.get(0).getLevel() - 2;
         Integer result = level;
         if (level > queryLevel) {
             queryLevel = level - 1;

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

@@ -237,8 +237,8 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 			example.orderBy("level");
 			List<BaseUserMemberLevel> baseUserMemberLevelList = baseUserMemberLevelMapper.selectByExample(example);
 			if (baseUserMemberLevelList != null && baseUserMemberLevelList.size() > 0) {
-				//如果购买会员是分成会员低一级会员以及分成会员，才参与分成
-				if (orderMemberDetail.getMemberLevel().compareTo(baseUserMemberLevelList.get(0).getLevel() - 1) >= 0) {
+				//如果购买会员是分成会员低二级会员以及分成会员，才参与分成
+				if (orderMemberDetail.getMemberLevel().compareTo(baseUserMemberLevelList.get(0).getLevel() - 2) >= 0) {
 					//所有分成会员都需要新增一条记录
 					for (BaseUserMemberLevel baseUserMemberLevel : baseUserMemberLevelList) {
 						List<BaseUserMember> baseUserMemberList = baseUserMemberBiz.selectList(new BaseUserMember() {{