Merge branch 'feature/1003348' into 'master'

feat: [1003348] 精品文章的链接在小程序配套资料包中不显示处理

See merge request rays/pcloud-book!855

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

@@ -1309,6 +1309,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         Map<Long, AppDto> appDtoMap = new HashMap<>();
         Map<Long, GroupActivity4AppletDTO> groupDtoMap = new HashMap<>();
         Map<Long, AppletNewsDTO> newsDtoMap = new HashMap<>();
+        List<RightsNowItem> list_remove = new ArrayList<>(); //存储已经删除群的群分类; 精选文章类型并且跳转链接包含qrcode.5rs.me
 
         if (!ListUtils.isEmpty(productIds)) {
             productDtoMap = productConsr.getProBasesByIds(productIds);
@@ -1363,6 +1364,9 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                 if (AppAndProductTypeEnum.APP.value.equals(item.getServeType())) {
                     AppDto appDto = appDtoMap.get(item.getServeId());
                     if (appDto != null) {
+                        if (!StringUtil.isEmpty(appDto.getTurnUrl()) && appDto.getTurnUrl().contains("qrcode.5rs.me") && "ARTICLE".equals(appDto.getTypeCode())){
+                            list_remove.add(item);
+                        }
                         item.setServeName(appDto.getTitle());
                         item.setServePic(appDto.getSquareImg());
                         item.setServeTypeCode(appDto.getTypeCode());
@@ -1385,6 +1389,8 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                         fillGroupActivityHead(Collections.singletonList(groupActivity4AppletDTO));
                         item.setGroupQrCode(groupActivity4AppletDTO.getGroupPic());
                         item.setGroupActivity4AppletDTO(groupActivity4AppletDTO);
+                    }else{
+                        list_remove.add(item); //把要移除的统一放在一个集合
                     }
                 }
                 if (RightsServeTypeEnum.NEWS.name().equals(item.getServeType())) {
@@ -1410,6 +1416,8 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                 }
             }
         }
+
+        nowItems.removeAll(list_remove);
     }
 
     private void fillGiftCouponPack(RightsSetting rightsSetting, Integer readType) {