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

Feature/xgh/202506迭代

See merge request !2984

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/chat/GroupChatActivityHmQDTO.java

@@ -49,6 +49,17 @@ public class GroupChatActivityHmQDTO implements Serializable {
 
     private GroupChatActivityDTO chatActivity;
 
+    // 指定门店
+    private String inStoreId ;
+
+    public String getInStoreId() {
+        return inStoreId;
+    }
+
+    public void setInStoreId(String inStoreId) {
+        this.inStoreId = inStoreId;
+    }
+
     public Long getChatActivityId() {
         return chatActivityId;
     }

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

@@ -249,15 +249,19 @@ public class JoinRuleManager {
     public List<GroupChatHmBO> handleMainStore(GroupChatActivityHmQDTO activityHmQDTO) {
         String enterpriseId = activityHmQDTO.getEnterpriseId();
         String wxEnterpriseId = activityHmQDTO.getChatActivity().getWxEnterpriseId();
-        MemberStoreResp memberStoreRelation = memberStoreService.getMemberStoreRelation(enterpriseId, activityHmQDTO.getInviteeMemberId());
-        if (memberStoreRelation == null) {
-            return new ArrayList<>();
-        }
-        String mainStoreId = memberStoreRelation.getMainStoreId();
-        if (StringUtils.isBlank(mainStoreId)) {
-            return new ArrayList<>();
+        if(StringUtils.isNotBlank(activityHmQDTO.getInStoreId())) {
+            return getByStoreIdList(enterpriseId,wxEnterpriseId, Lists.newArrayList(activityHmQDTO.getInStoreId()));
+        }else {
+            MemberStoreResp memberStoreRelation = memberStoreService.getMemberStoreRelation(enterpriseId, activityHmQDTO.getInviteeMemberId());
+            if (memberStoreRelation == null) {
+                return new ArrayList<>();
+            }
+            String mainStoreId = memberStoreRelation.getMainStoreId();
+            if (StringUtils.isBlank(mainStoreId)) {
+                return new ArrayList<>();
+            }
+            return getByStoreIdList(enterpriseId,wxEnterpriseId, Lists.newArrayList(mainStoreId));
         }
-        return getByStoreIdList(enterpriseId,wxEnterpriseId, Lists.newArrayList(mainStoreId));
     }
 
     /**