Merge branch 'feat-1001863' into 'master'

增加关键词相应内容字数限制

See merge request rays/pcloud-book!223

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

@@ -161,6 +161,9 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
         if (null == setKeywordVO || setKeywordVO.check()) {
             throw new BookBizException(BookBizException.PARAM_IS_NULL, "应用/作品信息为空");
         }
+        if (setKeywordVO.getContent() != null && setKeywordVO.getContent().length() > 1000) {
+            throw new BookBizException(BookBizException.PARAM_IS_NULL, "回复内容超出限制！");
+        }
         if (setKeywordVO.getClassifyId() == null) {
             setKeywordVO.setClassifyId(0L);
         }
@@ -513,7 +516,7 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
         String bookName = bookGroupDTO.getBookName();
         if (!ListUtils.isEmpty(bookGroupServeList)) {
             if (!StringUtil.isEmpty(bookName)) {
-                text = text + "《" + bookName + "》" + "配有以下资源服务，戳链接立即获取：\n";
+                text = text + "《" + bookName + "》" + "配有以下资源服务，点击链接立即获取：\n";
             }
             int i = 1;
             for (BookGroupServe bookGroupServe : bookGroupServeList) {

pcloud-service-book/src/main/resources/mapper/group/GroupQrcode.Mapper.xml

@@ -737,7 +737,16 @@
     </select>
 
     <select id="getWechatGroupInfoMap" parameterType="list" resultType="com.pcloud.book.group.dto.GroupQrcodeInfo4Advertising">
-        select id groupQrcodeId, group_name groupName, qrcode_url qrcodeUrl from book_group_qrcode where id in
+        SELECT
+        t.id groupQrcodeId,
+        t.group_name groupName,
+        t.qrcode_url qrcodeUrl,
+        bg.join_group_type joinGroupType
+        FROM
+        book_group_qrcode t
+        INNER JOIN book_group_classify t1 ON t.classify_id = t1.id
+        INNER JOIN book_group bg ON t1.book_group_id = bg.id
+        where t.id in
         <foreach collection="list" separator="," open="(" close=")" item="id">
             #{id}
         </foreach>