群活码-链接调整

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,6 +249,9 @@ public class JoinRuleManager {
     public List<GroupChatHmBO> handleMainStore(GroupChatActivityHmQDTO activityHmQDTO) {
         String enterpriseId = activityHmQDTO.getEnterpriseId();
         String wxEnterpriseId = activityHmQDTO.getChatActivity().getWxEnterpriseId();
+        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<>();
@@ -259,6 +262,7 @@ public class JoinRuleManager {
             }
             return getByStoreIdList(enterpriseId,wxEnterpriseId, Lists.newArrayList(mainStoreId));
         }
+    }
 
     /**
      * 获取会员协管门店群活码

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

@@ -195,7 +195,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
 
     // 群链接
     private ServiceResponse<HmLinkWxaDTO> getLinkChatHmFromWxa(String wxEnterpriseId, String enterpriseId,
-            String mixPhone, String unionid, String memberId, HmLinkBO link, HmLinkWxaDTO retDTO, LinkHmFromWxaQDTO qdto) {
+            String mixPhone, String unionid, String memberId, HmLinkBO link, HmLinkWxaDTO retDTO, LinkHmFromWxaQDTO qdto,String inStoreId) {
         Long hmId = link.getOtherChatHmId();
         Long linkId = link.getLinkId();
         if (StringUtils.isNotEmpty(mixPhone)) {
@@ -213,13 +213,17 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
             return ServiceResponse.failure("9999", "群活码不存在");
         }
         // [{"type":1服务门店2协管3lbs4指定人群,"open":1}]
-        JSONArray arr = JSONArray.parseArray(chatStoreRule) ;
         GroupChatActivityHmQDTO hmQDTO = new GroupChatActivityHmQDTO() ;
         hmQDTO.setEnterpriseId(enterpriseId);
         hmQDTO.setInviteeMemberId(memberId);
         GroupChatActivityDTO chatActivity = new GroupChatActivityDTO() ;
         chatActivity.setWxEnterpriseId(wxEnterpriseId);
         hmQDTO.setChatActivity(chatActivity);
+        if(StringUtils.isNotBlank(inStoreId)) {
+            hmQDTO.setInStoreId(inStoreId);
+            List<GroupChatHmBO> hmBOList = joinRuleManager.handleMainStore(hmQDTO);
+        }else {
+            JSONArray arr = JSONArray.parseArray(chatStoreRule) ;
             for(int i=0;i< arr.size();i++) {
                 JSONObject json = arr.getJSONObject(i) ;
                 int open = json.getIntValue("open") ;
@@ -289,6 +293,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                     }
                 }
             }
+        }
         GroupChatHmBO hm = null;
         if (null == hmId) {
             log.info("群活码不存在");
@@ -360,7 +365,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                     return ServiceResponse.success(retDTO) ;
                 }
             }
-            ServiceResponse<HmLinkWxaDTO> resp = this.getLinkChatHmFromWxa(wxEnterpriseId, enterpriseId, mixPhone, unionid, memberId, link, retDTO,qdto);
+            ServiceResponse<HmLinkWxaDTO> resp = this.getLinkChatHmFromWxa(wxEnterpriseId, enterpriseId, mixPhone, unionid, memberId, link, retDTO,qdto,inStoreId);
             if(null != resp.getResult()) {
                 resp.getResult().setGroupChatHm(true);
             }