fix 1012452

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java

@@ -179,7 +179,6 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
         if (qrcodeNameAndProId == null) {
             throw new BookBizException(BookBizException.PARAM_IS_NULL, "请先填写社群码信息！");
         }
-        String groupName = qrcodeNameAndProId.getGroupQrcodeName();
         bookGroupClassify.setProductId(qrcodeNameAndProId.getProductId());
         bookGroupClassify.setCreateUser(partyId);
         Integer rank = bookGroupClassifyDao.getMaxRank(addClassifyVO.getBookGroupId());
@@ -201,7 +200,16 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
         groupQrcode.setWeixinQrcodeId(oneQrcode.getId());
         groupQrcode.setUserNumber(oneQrcode.getUserNumber());
         groupQrcode.setGroupSeq(1);
-        groupQrcode.setGroupName(groupName + addClassifyVO.getClassify() + "1群");
+        // 群长度超过16部分会被截取，导致群名称重复
+        final String s = "1群";
+        String groupName = qrcodeNameAndProId.getGroupQrcodeName() + addClassifyVO.getClassify() + s;
+        if (groupName.length() > 15) {
+            groupName = addClassifyVO.getClassify() + s;
+            if (groupName.length() > 15) {
+                groupName = addClassifyVO.getClassify().substring(0, 16 - s.length()) + s;
+            }
+        }
+        groupQrcode.setGroupName(groupName);
         groupQrcode.setClassifyId(bookGroupClassify.getId());
         groupQrcode.setQrcodeHeadUrl(readerConsr.getNineHeadUrl());
         groupQrcodeBiz.insert(groupQrcode);

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/GroupQrcodeBizImpl.java

@@ -492,11 +492,11 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
                     Integer maxSeq = groupNameAndMaxSeqDTO.getMaxSeq() + 1;
                     String groupName = groupNameAndMaxSeqDTO.getGroupQrcodeName() + groupNameAndMaxSeqDTO.getClassify() + maxSeq + "群";
                     // 群长度超过16部分会被截取，导致群名称重复
-                    if (groupName.length() > 16) {
+                    if (groupName.length() > 15) {
                         final String s = maxSeq + "群";
                         groupName = groupNameAndMaxSeqDTO.getClassify() + s;
-                        if (groupName.length() > 16) {
-                            groupName = groupNameAndMaxSeqDTO.getClassify().substring(0, 16 - s.length()) + s;
+                        if (groupName.length() > 15) {
+                            groupName = groupNameAndMaxSeqDTO.getClassify().substring(0, 15 - s.length()) + s;
                         }
                     }
                     GroupQrcode groupQrcode = new GroupQrcode();

pcloud-service-book/src/main/java/com/pcloud/book/mq/topic/UpdateWXGroupNameListener.java

@@ -51,8 +51,8 @@ public class UpdateWXGroupNameListener {
             }
             String groupName = groupQrcode.getGroupName();
             // 如果数据库微信群名称超过16，就截断，然后重新设置数据库的名称，因为wxgroup那边设置的时候截断了
-            if (groupName.length() > 16) {
-                groupName = groupName.substring(0, 16);
+            if (groupName.length() > 15) {
+                groupName = groupName.substring(0, 15);
                 groupQrcodeDao.updateGroupName(groupQrcode.getId(), groupName);
             }
             if (!groupNameDTO.getNewGroupName().equals(groupName)) {