判断是否是品牌方进具体群，如果是，从暗号表获取已经定好的群

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/impl/BookGuideBizImpl.java

@@ -19,6 +19,7 @@ import com.pcloud.book.group.dto.JoinGroupCipherDTO;
 import com.pcloud.book.group.dto.PushAddUserMessageDTO;
 import com.pcloud.book.group.entity.AppTouchRecord;
 import com.pcloud.book.group.entity.GroupQrcode;
+import com.pcloud.book.group.entity.JoinGroupCipher;
 import com.pcloud.book.group.enums.TouchTypeEnum;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
 import com.pcloud.book.group.vo.GroupQrcodeBaseInfoVO;
@@ -120,7 +121,12 @@ public class BookGuideBizImpl implements BookGuideBiz {
         }
         final JoinGroupCipherDTO dto = joinGroupCipherDao.getDTOByCipher(cipher);
         //获取群
-        final GroupQrcodeBaseInfoVO wxGroup = bookGroupClassifyBiz.getWxGroupIdByClassifyIdAndWechatId(dto.getClassifyId(), dto.getWechatUserId());
+        GroupQrcodeBaseInfoVO wxGroup = bookGroupClassifyBiz.getWxGroupIdByClassifyIdAndWechatId(dto.getClassifyId(), dto.getWechatUserId());
+        //判断是否是品牌方进具体群，如果是，从暗号表获取已经定好的群
+        if ((!StringUtil.isEmpty(agreeAddUserDTO.getCipher())) && agreeAddUserDTO.getCipher().contains("RAYS_PCLOUD_")) {
+            JoinGroupCipher joinGroupCipher = joinGroupCipherDao.getByCipher(agreeAddUserDTO.getCipher());
+            wxGroup = groupQrcodeDao.getBaseById(joinGroupCipher.getQrcodeId());
+        }
         if (null == wxGroup) {
             log.error("[同意加好友发送欢迎语] : bookGroupClassifyBiz.getWxGroupIdByClassifyIdAndWechatId dto:{}");
             throw new BookBizException(BookBizException.ID_NOT_EXIST, "群不存在");