保存人群修改

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatActivityJoinServiceImpl.java

@@ -54,33 +54,24 @@ public class GroupChatActivityJoinServiceImpl implements GroupChatActivityJoinSe
     public void saveActivityJoin(TabGroupChatActivity activity, List<TabGroupChatActivityJoin> rewardList) {
         Long chatActivityId = activity.getChatActivityId();
         List<TabGroupChatActivityJoin> oldJoinList = listByActivityId(chatActivityId);
-        Map<Integer, TabGroupChatActivityJoin> oldRewardMap = oldJoinList.stream().collect(
-                Collectors.toMap(TabGroupChatActivityJoin::getIndex, v -> v));
+        Map<Long, TabGroupChatActivityJoin> oldRewardMap = oldJoinList.stream().collect(
+                Collectors.toMap(TabGroupChatActivityJoin::getChatActivityJoinId, v -> v));
+        //先删除
+        businessManager.dealMemberTagByActivity(activity,null,true);
         rewardList.forEach(rule->{
-            Integer index = rule.getIndex();
-            TabGroupChatActivityJoin oldRule = oldRewardMap.get(index);
-            if (oldRule != null) {
-                oldRewardMap.remove(index);
-                rule.setChatActivityJoinId(oldRule.getChatActivityJoinId());
-            }
             Long chatActivityJoinId = rule.getChatActivityJoinId();
+            if (chatActivityJoinId != null) {
+                oldRewardMap.remove(chatActivityJoinId);
+            }
             if (chatActivityJoinId == null) {
                 rule.setChatActivityJoinId(UniqueIdUtils.uniqueLong());
                 groupChatActivityJoinMapper.insert(rule);
             }else {
                 groupChatActivityJoinMapper.update(rule);
             }
+            businessManager.dealMemberTagByActivity(activity,rule,false);
         });
         oldRewardMap.forEach((k, v) -> groupChatActivityJoinMapper.deleteById(v.getChatActivityJoinId()));
 
-        List<TabGroupChatActivityJoin> newJoinList = listByActivityId(chatActivityId);
-        //先删除
-        businessManager.dealMemberTagByActivity(activity,null,true);
-        for (TabGroupChatActivityJoin activityJoin : newJoinList) {
-            //处理会员分组
-            businessManager.dealMemberTagByActivity(activity,activityJoin,false);
-        }
-
-
     }
 }