Merge branch 'ruansiyuan'

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

@@ -155,8 +155,8 @@ public class BookGuideBizImpl implements BookGuideBiz {
             return;
         }
         // 生产环境限制30，其它5和10，全部使用群链接
-//        final boolean isPro = "pro".equalsIgnoreCase(BookProps.getSystemEnv());
-//        if ((!StringUtil.isBlank(num) && Integer.parseInt(num) >= (isPro ? 30 : 5)) || peopleCounts >= (isPro ? 30 : 10)) {
+        final boolean isPro = "pro".equalsIgnoreCase(BookProps.getSystemEnv());
+        if ((!StringUtil.isBlank(num) && Integer.parseInt(num) >= (isPro ? 30 : 5)) || peopleCounts >= (isPro ? 30 : 10)) {
             SendGroupInviteVO sendGroupInviteVO = new SendGroupInviteVO();
             sendGroupInviteVO.setAltId(agreeAddUserDTO.getRobotWxId());
             sendGroupInviteVO.setWxId(agreeAddUserDTO.getUserWxId());
@@ -167,21 +167,21 @@ public class BookGuideBizImpl implements BookGuideBiz {
             updateQrcodeForCipher(wxGroupId, cipher, agreeAddUserDTO.getUserWxId());
             return;
 //        }
-//        AddToGroupVO vo1 = new AddToGroupVO();
-//        vo1.setWxGroupId(wxGroupId);
-//        vo1.setWxId(agreeAddUserDTO.getUserWxId());
-//        vo1.setAltId(agreeAddUserDTO.getRobotWxId());
-//        vo1.setIp(agreeAddUserDTO.getIp());
-//        log.info("[同意加好友发送欢迎语 拉群] AddToGroupVO ：{}", vo1);
-//        WxGroupSDK.addToGroup(vo1);
-//        // 进群之后更新群qrCodeId
-//        updateQrcodeForCipher(wxGroupId, cipher, agreeAddUserDTO.getUserWxId());
-//        // 拉一次+1
-//        if (StringUtil.isBlank(num)) {
-//            JedisClusterUtils.getSet(BookConstant.WXGROUP_ADD_USER_NUM + agreeAddUserDTO.getRobotWxId(), "1", 3600 * 24);
-//        } else {
-//            JedisClusterUtils.incr(BookConstant.WXGROUP_ADD_USER_NUM + agreeAddUserDTO.getRobotWxId());
-//        }
+        AddToGroupVO vo1 = new AddToGroupVO();
+        vo1.setWxGroupId(wxGroupId);
+        vo1.setWxId(agreeAddUserDTO.getUserWxId());
+        vo1.setAltId(agreeAddUserDTO.getRobotWxId());
+        vo1.setIp(agreeAddUserDTO.getIp());
+        log.info("[同意加好友发送欢迎语 拉群] AddToGroupVO ：{}", vo1);
+        WxGroupSDK.addToGroup(vo1);
+        // 进群之后更新群qrCodeId
+        updateQrcodeForCipher(wxGroupId, cipher, agreeAddUserDTO.getUserWxId());
+        // 拉一次+1
+        if (StringUtil.isBlank(num)) {
+            JedisClusterUtils.getSet(BookConstant.WXGROUP_ADD_USER_NUM + agreeAddUserDTO.getRobotWxId(), "1", 3600 * 24);
+        } else {
+            JedisClusterUtils.incr(BookConstant.WXGROUP_ADD_USER_NUM + agreeAddUserDTO.getRobotWxId());
+        }
     }
 
     @ParamLog("进群之后更新群qrCodeId")