Merge branch 'fixbug/1032300' into 'master'

bug: [1032300] 应用智能推荐已删除的应用，页面仍旧显示

See merge request rays/pcloud-book!1491

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

@@ -3152,6 +3152,12 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 recommendServeVO.setServeId(dto.getServeId());
                 recommendServeVO.setServeType("APP");
                 if (null != appDto) {
+                    if(null!=appDto.getIsDelete() && YesOrNoNumEnum.YES.getValue().equals(appDto.getIsDelete())){
+                        continue;
+                    }
+                    if(null!=appDto.getAuditState() && !YesOrNoNumEnum.YES.getValue().equals(appDto.getAuditState())){
+                        continue;
+                    }
                     recommendServeVO.setServeName(appDto.getTitle());
                     recommendServeVO.setServePic(appDto.getSquareImg());
                     recommendServeVO.setTransverseImg(appDto.getTransverseImg());
@@ -3169,6 +3175,18 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                     if(CollUtil.isNotEmpty(superMerchantIdList) && superMerchantIdList.contains(productDto.getCreatedUser())){
                         superProductIds.add(productDto.getProductId());
                     }
+                    if(null!=productDto.getIsDelete() && YesOrNoNumEnum.YES.getValue().equals(productDto.getIsDelete())){
+                        continue;
+                    }
+                    if(null!=productDto.getSaleState() && !"1".equals(productDto.getSaleState())){
+                        continue;
+                    }
+                    if(null!=productDto.getSaleStartDate() && productDto.getSaleStartDate().after(new Date())){
+                        continue;
+                    }
+                    if(null!=productDto.getSaleEndDate() && productDto.getSaleEndDate().before(new Date())){
+                        continue;
+                    }
                     recommendServeVO.setServeName(productDto.getProductName());
                     recommendServeVO.setServePic(productDto.getCoverImg());
                     recommendServeVO.setTransverseImg(productDto.getPicture1());