社区链接

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkChatDTO.java

@@ -21,6 +21,8 @@ public class HmLinkChatDTO implements Serializable {
     private String filterJson;
     /**群活码ID*/
     private Long chatHmId;
+
+    private Integer otherFlag ;
     private String enterpriseId;
     /**会员类型（0：会员筛选，1：会员分组）*/
     private Integer memberType;
@@ -38,6 +40,14 @@ public class HmLinkChatDTO implements Serializable {
     // 用于人群回显
     private String searchJson;
 
+    public Integer getOtherFlag() {
+        return otherFlag;
+    }
+
+    public void setOtherFlag(Integer otherFlag) {
+        this.otherFlag = otherFlag;
+    }
+
     public String getSearchJson() {
         return searchJson;
     }

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

@@ -240,7 +240,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
             for(int i=0;i< arr.size();i++) {
                 JSONObject json = arr.getJSONObject(i) ;
                 int open = json.getIntValue("open") ;
-                if(open == 1) {
+                if(open == 1 && StringUtils.isNotBlank(memberId)) {
                     int type = json.getIntValue("type") ;
                     if(type==1) {
                         log.info("服务门店");
@@ -251,7 +251,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                             hmId = hmBOList.get(sort).getChatHmId() ;
                             break;
                         }
-                    }else if(type==2) {
+                    }else if(type==2  && StringUtils.isNotBlank(memberId)) {
                         log.info("协管门店");
                         List<GroupChatHmBO> hmBOList = joinRuleManager.handleOtherStore(hmQDTO);
                         if(CollectionUtils.isNotEmpty(hmBOList)) {
@@ -304,12 +304,20 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                         List<HmLinkChatDTO> hmList = this.hmLinkChatService.listByLinkId(wxEnterpriseId, enterpriseId, linkId);
                         if (CollectionUtils.isNotEmpty(hmList)) {
                             for (HmLinkChatDTO item : hmList) {
-                                boolean flag = this.memberCondition(enterpriseId, memberId, item, link.getCreatorId(),
-                                        link.getUpdateTime());
-                                if (flag) {
-                                    log.info("使用特殊群活码={}", item.getChatHmId());
-                                    hmId = item.getChatHmId();
-                                    break;
+                                if(StringUtils.isBlank(memberId)) {
+                                    if(item.getOtherFlag() == 1) {
+                                        log.info("使用特殊群活码={}", item.getChatHmId());
+                                        hmId = item.getChatHmId();
+                                        break;
+                                    }
+                                }else {
+                                    boolean flag = this.memberCondition(enterpriseId, memberId, item, link.getCreatorId(),
+                                            link.getUpdateTime());
+                                    if (flag) {
+                                        log.info("使用特殊群活码={}", item.getChatHmId());
+                                        hmId = item.getChatHmId();
+                                        break;
+                                    }
                                 }
                             }
                         }

haoban-manage3-service/src/main/resources/mapper/hm/HmLinkChatMapper.xml

@@ -93,7 +93,7 @@
 		link_chat_id linkChatId ,
 		filter_json filterJson ,
 		chat_hm_id chatHmId,
-		member_type memberType 
+		member_type memberType , other_flag otherFlag
 		from  tab_haoban_hm_link_chat where link_id = #{linkId} and wx_enterprise_id = #{wxEnterpriseId}  and enterprise_id = #{enterpriseId} and other_flag = 0
 		and delete_flag = 0
 	</select>