会员拆分

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankSettingServiceImpl.java

@@ -1119,7 +1119,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         List<MemberRankSettingWrapper.MemberRankSetting> memberRankSettings = JSON.parseArray(JSON.toJSONString(settingMap.values()), MemberRankSettingWrapper.MemberRankSetting.class);
 
         //  更新人ID集合
-        List<Integer> operatorIds = memberRankSettings.stream().map(o -> o.getOperator()).collect(Collectors.toList());
+        List<Integer> operatorIds = memberRankSettings.stream().map(MemberRankSettingWrapper.MemberRankSetting::getOperator).collect(Collectors.toList());
         Map<Long, SysUser> sysUserMap = sysUserService.getMapByIds(operatorIds);
 
 
@@ -1259,20 +1259,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         if (CollectionUtils.isEmpty(memberRankSettings)) {
             return new HashMap<>();
         }
-        List<Integer> parentRankIds = memberRankSettings.stream().map(MemberRankSetting::getParentId).filter(parentId -> parentId != 0).collect(Collectors.toList());
-        List<MemberRankSetting> parentMemberRankSettings = memberRankSettingDao.selectBatchIds(parentRankIds);
-        Map<Integer, MemberRankSetting> memberRankSettingMap = memberRankSettings.stream().collect(Collectors.toMap(MemberRankSetting::getId, memberRankSetting -> memberRankSetting));
-        Map<Integer, MemberRankSetting> parentMemberRankSettingMap = parentMemberRankSettings.stream().collect(Collectors.toMap(MemberRankSetting::getId, memberRankSetting -> memberRankSetting));
-        Map<Integer, String> memberNameMap = new HashMap<>();
-        memberRankSettingMap.forEach((k, v) -> {
-            MemberRankSetting parentRank = parentMemberRankSettingMap.get(v.getParentId());
-            if (parentRank != null) {
-                memberNameMap.put(k, parentRank.getName() + "-" + v.getName());
-            } else {
-                memberNameMap.put(k, v.getName());
-            }
-        });
-        return memberNameMap;
+        return memberRankSettings.stream().collect(Collectors.toMap(MemberRankSetting::getId, MemberRankSetting::getName));
     }
 
     @Override
@@ -1281,13 +1268,6 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         if(memberRankSetting == null){
             return "";
         }
-        String name = memberRankSetting.getName();
-        if(memberRankSetting.getParentId() != 0){
-            MemberRankSetting rankSetting = memberRankSettingDao.get(memberRankSetting.getParentId());
-            if(rankSetting != null){
-                name = rankSetting.getName() + "-" + name;
-            }
-        }
-        return name;
+        return memberRankSetting.getName();
     }
 }