Merge branch 'feature/1003461' into 'master'

feat:[1003461] 首页概览（二期）

See merge request rays/pcloud-book!950

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDataStatisticsDTO.java

@@ -25,4 +25,7 @@ public class BookDataStatisticsDTO {
 
     @ApiModelProperty("书刊类型")
     private String bookCategory;
+
+    @ApiModelProperty("书刊类型")
+    private Integer joinGroupType;
 }

pcloud-facade-book/src/main/java/com/pcloud/book/group/enums/JoinGroupTypeEnum.java

@@ -42,4 +42,15 @@ public enum JoinGroupTypeEnum {
         this.code = code;
         this.name = name;
     }
+
+    public static String getBookTypeName(Integer code){
+        if(JoinGroupTypeEnum.XIAORUI.getCode().equals(code)){
+            return "小睿书";
+        } else if(JoinGroupTypeEnum.ROBOT.getCode().equals(code) || JoinGroupTypeEnum.AI_ROBOT.getCode().equals(code)){
+            return "1V1";
+        } else if(JoinGroupTypeEnum.GROUP_QRCODE.getCode().equals(code)){
+            return "微信群";
+        }
+        return null;
+    }
 }

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

@@ -1200,10 +1200,11 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 					bookDataStatisticsDTO.setScanCount(groupUserCountDTO.getCount().longValue());
 					bookDataStatisticsDTO.setUserCount(groupUserCountDTO.getUserCount().longValue());
 				}
-				bookDataStatisticsDTO.setBookCategory("社群书");
-				if(rightsMap.containsKey(bookGroupDTO.getBookId())){
-					bookDataStatisticsDTO.setBookCategory("社群书(已配置书刊权益)");
-				}
+				bookDataStatisticsDTO.setBookCategory(JoinGroupTypeEnum.getBookTypeName(bookGroupDTO.getJoinGroupType()));
+				bookDataStatisticsDTO.setJoinGroupType(bookGroupDTO.getJoinGroupType());
+				/*if(rightsMap.containsKey(bookGroupDTO.getBookId())){
+					bookDataStatisticsDTO.setBookCategory(JoinGroupTypeEnum.getBookTypeName(bookGroupDTO.getJoinGroupType()) + "(已配置书刊权益)");
+				}*/
 				resultMap.put(bookDataStatisticsDTO.getBookChannelAdviserId(), bookDataStatisticsDTO);
 			}
 		}
@@ -1214,10 +1215,10 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 			if(bookDataStatisticsDTO != null){
 				bookDataStatisticsDTO.setScanCount(bookDataStatisticsDTO.getScanCount() + browseCacheRecordDto.getScanCount());
 				bookDataStatisticsDTO.setUserCount(bookDataStatisticsDTO.getUserCount() + browseCacheRecordDto.getBrowserCounts());
-				bookDataStatisticsDTO.setBookCategory("现代纸书、社群书");
-				if(rightsMap.containsKey(browseCacheRecordDto.getJournalId())){
+				bookDataStatisticsDTO.setBookCategory("现代纸书、" + JoinGroupTypeEnum.getBookTypeName(bookDataStatisticsDTO.getJoinGroupType()));
+				/*if(rightsMap.containsKey(browseCacheRecordDto.getJournalId())){
 					bookDataStatisticsDTO.setBookCategory("现代纸书、社群书(已配置书刊权益)");
-				}
+				}*/
 				continue;
 			}
 			bookDataStatisticsDTO = new BookDataStatisticsDTO();