Merge branch 'fixbug/1004629' into 'master'

feat: [1004631] 编辑端所有RAYS码走自定义H5配置

See merge request rays/pcloud-book!1268

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

@@ -2804,7 +2804,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 	@Override
 	public PageBeanNew<BookQrcodeVO> qrList4AdviserBookNew(Long bookId, Long channelId, Long adviserId, String sceneName, Integer currentPage, Integer numPerPage) {
 
-		// 获取 book_group 二维码列表
+		// 获取 book_group 二维码列表 仅包含 自有码
 		CompletableFuture<List<BookQrcodeVO>> bookGroupIdFuture = CompletableFuture.supplyAsync(() -> {
 			List<Long> locationIds = null;
 			if (StrUtil.isNotBlank(sceneName)) {
@@ -2815,7 +2815,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 			return Optional.ofNullable(bookGroupDao.listBookQrcodes(bookId, channelId, adviserId, sceneName, locationIds)).orElse(new ArrayList<>());
 		}, ThreadPoolUtils.OTHER_POOL);
 
-		// 获取 qrcode_scene 二维码列表
+		// 获取 qrcode_scene 二维码列表 包含 自有码 和 公众号码
 		CompletableFuture<List<BookQrcodeVO>> qrcodeSceneFuture = CompletableFuture.supplyAsync(
 				() -> Optional.ofNullable(qrcodeSceneConsr.qrList4AdviserBookNew(bookId, channelId, adviserId, sceneName)).orElse(new ArrayList<>()));
 
@@ -2854,13 +2854,12 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 				Collectors.groupingBy(BookQrcodeVO::getSource, Collectors.mapping(BookQrcodeVO::getSceneId, Collectors.toList())));
 
 		// 二维码标签 二维码印码位置 二维码类型 二维码ID 二维码地址 服务
-
-		// TODO 分组填充信息
+		// 区分二维码来源 分别去book 和 channel 填充信息
 		List<Long> bookGroupIds = Optional.ofNullable(map).map(x -> x.get("bookGroup")).orElse(new ArrayList<>());
 		List<Long> qrcodeSceneIds = Optional.ofNullable(map).map(x -> x.get("qrcodeScene")).orElse(new ArrayList<>());
 
 
-
+		// 获取渠道中二维码信息-包含 自有码和公众号码 返回结果对二维码类型进行了纠正
 		CompletableFuture<Map<Long, BookQrcodeVO>> qrcodeSceneFuture = CompletableFuture.supplyAsync(() ->
 				Optional.ofNullable(channelConsr.getQrList4SceneIds(qrcodeSceneIds))
 				.map(x -> x.stream().filter(Objects::nonNull).collect(Collectors.toMap(BookQrcodeVO::getSceneId, Function.identity())))
@@ -2966,13 +2965,17 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 			for (BookQrcodeVO bookQrcodeVO : pageList) {
 				if (Objects.isNull(bookQrcodeVO) || Objects.isNull(bookQrcodeVO.getSceneId())) continue;
 				if (Objects.equals(bookQrcodeVO.getSource(), "qrcodeScene")) {
+					// 填充渠道中的码(同时纠正码的类型)
 					if (Objects.nonNull(qrcodeVOMap.get(bookQrcodeVO.getSceneId())))
 						BeanUtils.copyProperties(qrcodeVOMap.get(bookQrcodeVO.getSceneId()), bookQrcodeVO);
 				} else if (Objects.equals(bookQrcodeVO.getSource(), "bookGroup")) {
 
-
-					BookQrcodeVO qrcodeVO = Optional.ofNullable(bookGroupMap.get(bookQrcodeVO.getSceneId())).orElse(new BookQrcodeVO());
+					// 社群码将ID赋值给BookGroupId
+					Long sceneId = bookQrcodeVO.getSceneId();
+					BookQrcodeVO qrcodeVO = Optional.ofNullable(bookGroupMap.get(sceneId)).orElse(new BookQrcodeVO());
 					BeanUtils.copyProperties(qrcodeVO,bookQrcodeVO);
+					bookQrcodeVO.setBookGroupId(sceneId);
+					bookQrcodeVO.setSceneId(null);
 
 					// 填充标签名称
 					bookQrcodeVO.setProLabelName(Optional.ofNullable(bookQrcodeVO.getProLabelId()).map(labelNameMap::get).orElse(""));
@@ -2980,9 +2983,9 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 					bookQrcodeVO.setDepLabelName(Optional.ofNullable(bookQrcodeVO.getDepLabelId()).map(labelNameMap::get).orElse(""));
 
 					// 填充统计信息
-					bookQrcodeVO.setCounts(Optional.ofNullable(bookQrcodeVO.getSceneId()).map(bookGroupStatsMap::get).map(GroupUserCountDTO::getCount).map(Long::valueOf).orElse(0L));
-					bookQrcodeVO.setBrowseCounts(Optional.ofNullable(bookQrcodeVO.getSceneId()).map(bookGroupStatsMap::get).map(GroupUserCountDTO::getCount).map(Long::valueOf).orElse(0L));
-					bookQrcodeVO.setBrowserCounts(Optional.ofNullable(bookQrcodeVO.getSceneId()).map(bookGroupStatsMap::get).map(GroupUserCountDTO::getUserCount).map(Long::valueOf).orElse(0L));
+					bookQrcodeVO.setCounts(Optional.ofNullable(sceneId).map(bookGroupStatsMap::get).map(GroupUserCountDTO::getCount).map(Long::valueOf).orElse(0L));
+					bookQrcodeVO.setBrowseCounts(Optional.ofNullable(sceneId).map(bookGroupStatsMap::get).map(GroupUserCountDTO::getCount).map(Long::valueOf).orElse(0L));
+					bookQrcodeVO.setBrowserCounts(Optional.ofNullable(sceneId).map(bookGroupStatsMap::get).map(GroupUserCountDTO::getUserCount).map(Long::valueOf).orElse(0L));
 
 					// 填充印码位置信息
 					List<QrcodeLocationDto> qrcodeLocations = bookQrcodeVO.getQrcodeLocations();
@@ -2997,13 +3000,13 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 					}
 
 					// 填充资源列表
-					if (CollUtil.isEmpty(bookGroupServeMap) || CollUtil.isEmpty(bookGroupServeMap.get(bookQrcodeVO.getSceneId()))){
+					if (CollUtil.isEmpty(bookGroupServeMap) || CollUtil.isEmpty(bookGroupServeMap.get(sceneId))){
 						bookQrcodeVO.setMessages(new ArrayList<>());
 						continue;
 					}
 
 					// 填充资源明细
-					List<BookGroupServe> bookGroupServes = bookGroupServeMap.get(bookQrcodeVO.getSceneId());
+					List<BookGroupServe> bookGroupServes = bookGroupServeMap.get(sceneId);
 					List<MessageDto> messageDtos = new ArrayList<>(bookGroupServes.size());
 					for (BookGroupServe bookGroupServe : bookGroupServes) {
 						MessageDto messageDto = new MessageDto();