Merge branch 'feature/1005043' into 'master'

feat:[1005043]加群分类

See merge request rays/pcloud-book!1362

pcloud-facade-book/src/main/java/com/pcloud/book/applet/dto/GroupActivity4AppletDTO.java

@@ -90,4 +90,10 @@ public class GroupActivity4AppletDTO implements Serializable {
 
     @ApiModelProperty("描述")
     private String groupDesc;
+
+    @ApiModelProperty("群分类")
+    private Long firstClassify;
+
+    @ApiModelProperty("群分类")
+    private String firstClassifyName;
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/vo/response/BookQrcodeWxworkResponseVO.java

@@ -70,4 +70,8 @@ public class BookQrcodeWxworkResponseVO extends BaseDto {
      */
     private String url;
 
+    /**
+     * 群分类
+     */
+    private String classifyName;
 }

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

@@ -786,6 +786,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             responseVO.setGroupName(wxworkGroupQrcodeBaseDTO.getGroupQrcodeName());
             responseVO.setGroupDesc(wxworkGroupQrcodeBaseDTO.getInvitationRays());
             responseVO.setUrl(wxworkGroupQrcodeBaseDTO.getUrl());
+            responseVO.setClassifyName(wxworkGroupQrcodeBaseDTO.getClassifyName());
             //头像列表从缓存里取
             List<String> headUrlList = appletGroupSearchRecordBiz.getHeadUrlList(9, itemVO.getServeId());
             responseVO.setHeadUrlList(headUrlList);

pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/impl/PcloudGroupActivityBizImpl.java

@@ -834,10 +834,15 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
         if (!ListUtils.isEmpty(activityGroupIds)) {
             localMap = pcloudGroupActivityDao.getByIds(activityGroupIds, 1);
         }
+        List<Long> firstClassifys = localMap.values().stream().filter(s->s.getFirstClassify()>0).map(GroupActivity4AppletDTO::getFirstClassify).distinct().collect(Collectors.toList());
+        Map<Long, AssistTempletDTO> classifyMap = assistTempletConsr.mapByIds4Classify(firstClassifys);
         for(GroupActivity4AppletDTO groupActivity4AppletDTO: localMap.values()){
             String filterStr = StringUtilParent.replaceHtml(groupActivity4AppletDTO.getDesc());
             String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr;
             groupActivity4AppletDTO.setCutDesc(subStr);
+            if (!MapUtils.isEmpty(classifyMap) && classifyMap.containsKey(groupActivity4AppletDTO.getFirstClassify())){
+                groupActivity4AppletDTO.setFirstClassifyName(classifyMap.get(groupActivity4AppletDTO.getFirstClassify()).getTempletName());
+            }
         }
         return localMap;
     }