Merge branch 'feature/1004188-01' into 'master'

feat: [1004188] getti外刊阅读

See merge request rays/pcloud-book!1215

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

@@ -5257,12 +5257,6 @@ public class BookGroupBizImpl implements BookGroupBiz {
             if ((AppAndProductTypeEnum.APP.value.equals(item.getServeType()) && ArrayUtils.contains(RightsSettingConstant.APPLET_APP_NOT_SUPPORT, item.getFromType()))
                     || (AppAndProductTypeEnum.PRODUCT.value.equals(item.getServeType()) && ArrayUtils.contains(RightsSettingConstant.APPLET_PRODUCT_NOT_SUPPORT, item.getFromType())) || StringUtil.isEmpty(item.getFromType())) {
                 toRemoveList.add(item);
-            } else {
-                //RAYS应用在小程序里单独展示
-                List<String> typeCodes = appConsr.getRaysAppTypeCodes();
-                if (!ListUtils.isEmpty(typeCodes) && typeCodes.contains(item.getFromType())) {
-                    toRemoveList.add(item);
-                }
             }
         }
         if (!ListUtils.isEmpty(toRemoveList)) {
@@ -6441,12 +6435,18 @@ public class BookGroupBizImpl implements BookGroupBiz {
                 continue;
             }
             if (AppAndProductTypeEnum.APP.value.equals(bookServeDTO.getServeType())) {
+                List<String> typeCodes = appConsr.getRaysAppTypeCodes();
                 if (!MapUtils.isEmpty(appDtoMap) && null != appDtoMap.get(bookServeDTO.getServeId())) {
                     AppDto appDto = appDtoMap.get(bookServeDTO.getServeId());
                     if (checkRayUrl(appDto.getTurnUrl()) && AppTypeEnum.ARTICLE.value.equals(appDto.getTypeCode())){
                         removeList.add(bookServeDTO);
                         continue;
                     }
+                    //RAYS应用在小程序里单独展示,不展示在配套资料中
+                    if (!ListUtils.isEmpty(typeCodes) && typeCodes.contains(appDto.getTypeCode())) {
+                        removeList.add(bookServeDTO);
+                        continue;
+                    }
                     bookServeDTO.setServeName(appDto.getTitle());
                     bookServeDTO.setCoverImg(appDto.getSquareImg());
                     bookServeDTO.setFromType(appDto.getTypeCode());

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

@@ -3493,12 +3493,6 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                     || AppAndProductTypeEnum.PRODUCT.value.equals(item.getServeType()) && ArrayUtils
                     .contains(RightsSettingConstant.APPLET_PRODUCT_NOT_SUPPORT, item.getServeTypeCode())) {
                 toRemoveList.add(item);
-            } else {
-                //RAYS应用在小程序里单独展示
-                List<String> typeCodes = appConsr.getRaysAppTypeCodes();
-                if (!ListUtils.isEmpty(typeCodes) && typeCodes.contains(item.getServeTypeCode())) {
-                    toRemoveList.add(item);
-                }
             }
         }
         if (!ListUtils.isEmpty(toRemoveList)) {
@@ -4406,4 +4400,5 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         List<BookServeDTO> list = rightsNowItemDao.getServeItemsByServeTypes(rightsSettingDto.getId(), serveTypes,limit);
         return list;
     }
+
 }