Merge branch 'fixbug/fixServeTotalCount' into 'master'

fix: [none] 解决资源统计只有1v1时统计错误的问题

See merge request rays/pcloud-book!883

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

@@ -1095,14 +1095,14 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 					added = true;
 				}
 			}
-			if(bookGroupServeCountDTO != null) {
+			// 设置默认值
+			int rightsCount = 0;
+			if(bookGroupServeCountDTO != null && JoinGroupTypeEnum.XIAORUI.getCode().equals(bookGroupServeCountDTO.getJoinGroupType())) {
 				// 如果是小睿码，则设置权益数
-				if (JoinGroupTypeEnum.XIAORUI.getCode().equals(bookGroupServeCountDTO.getJoinGroupType())) {
-					int rightsCount = null == bookGroupServeCountDTO.getRightsCount() ? 0 : bookGroupServeCountDTO.getRightsCount();
-					bookResourceStatisticsDTO.setRightsCount(rightsCount);
-					bookResourceStatisticsDTO.setServeTotalCount(bookResourceStatisticsDTO.getServeCount() + rightsCount);
-				}
+				rightsCount = null == bookGroupServeCountDTO.getRightsCount() ? 0 : bookGroupServeCountDTO.getRightsCount();
 			}
+			bookResourceStatisticsDTO.setRightsCount(rightsCount);
+			bookResourceStatisticsDTO.setServeTotalCount(bookResourceStatisticsDTO.getServeCount() + rightsCount);
 			mapBookResourceStatistics.put(bookChannelAdviserId, bookResourceStatisticsDTO);
 		}
 		return mapBookResourceStatistics;