Merge branch 'feature/xgh/202506迭代' into 'developer'

Feature/xgh/202506迭代

See merge request !3047

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/context/chat/JoinRuleManager.java

@@ -313,6 +313,7 @@ public class JoinRuleManager {
         }
         //获取storeId对应活码
         Map<String, List<GroupChatHmBO>> storeToHmMap = getStoreIdToGroupChatHmBOMap(enterpriseId, wxEnterpriseId, storeIds);
+        addSetHm(storeIds, storeToHmMap);
         if (MapUtil.isEmpty(storeToHmMap)) {
             return new ArrayList<>();
         }
@@ -336,6 +337,24 @@ public class JoinRuleManager {
         return storeToHmMap.get(storeId);
     }
 
+    public void addSetHm(List<String> storeIds, Map<String, List<GroupChatHmBO>> storeToHmMap) {
+        List<TabGroupChatHm> hmList = groupChatHmMapper.listByStoreIdList(storeIds) ;
+        if(CollectionUtils.isNotEmpty(hmList)) {
+            List<GroupChatHmBO> setList = EntityUtil.changeEntityListByJSON(GroupChatHmBO.class,hmList) ;
+            Map<String,List<GroupChatHmBO>> setMap = setList.stream().collect(Collectors.groupingBy(o->o.getStoreId(),Collectors.toList()));
+            Set<String> set = setMap.keySet();
+            Iterator<String> it = set.iterator();
+            while (it.hasNext()) {
+                String key = it.next() ;
+                if(null != storeToHmMap.get(key)) {
+                    storeToHmMap.get(key).addAll(setMap.get(key));
+                }else {
+                    storeToHmMap.put(key,setMap.get(key));
+                }
+            }
+        }
+    }
+
     /**
      * 根据门店id获取群活码
      * @param enterpriseId  企业id

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java

@@ -271,6 +271,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                             log.info("lbs门店={}",storeIds);
                             //获取storeId对应活码
                             Map<String, List<GroupChatHmBO>> storeToHmMap = this.joinRuleManager.getStoreIdToGroupChatHmBOMap(enterpriseId, wxEnterpriseId, storeIds);
+                            this.joinRuleManager.addSetHm(storeIds, storeToHmMap);
                             if (MapUtil.isEmpty(storeToHmMap)) {
                                 break;
                             }