Merge branch 'ruansiyuan'

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

@@ -136,15 +136,14 @@ public class BookGuideBizImpl implements BookGuideBiz {
             vo.setIp(agreeAddUserDTO.getIp());
             log.info("[同意加好友发送欢迎语] : {}", vo);
             WxGroupSDK.sendTextMessage(vo);
-        } else {
-            // 如果不是第一次就发关键词
-            // 根据暗号获取分类id和bookGroupId推送关键词欢迎语
-            List<KeywordDTO> keywords = bookKeywordBiz.listFiveKeyword(dto.getClassifyId(), dto.getBookGroupId());
-            //发主打资源
-            sendMainKeyword(keywords,agreeAddUserDTO,dto,wxGroupId);
-            //发关键词列表
-            SendWeixinRequestTools.sendKeywordsInfo(keywords, agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getUserWxId(), agreeAddUserDTO.getIp());
         }
+        // 如果不是第一次就发关键词
+        // 根据暗号获取分类id和bookGroupId推送关键词欢迎语
+        List<KeywordDTO> keywords = bookKeywordBiz.listFiveKeyword(dto.getClassifyId(), dto.getBookGroupId());
+        //发主打资源
+        sendMainKeyword(keywords,agreeAddUserDTO,dto,wxGroupId);
+        //发关键词列表
+        SendWeixinRequestTools.sendKeywordsInfo(keywords, agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getUserWxId(), agreeAddUserDTO.getIp());
         // 拉群
         final Integer peopleCounts = WxGroupSDK.getPeopleCounts(wxGroupId, agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getIp());
         // 邀请好友进群有次数限制，目前测试为每天只能拉30-40人就操作频繁，所以在此加判断，超过30人或者群人数超过30人就发送邀请链接