Merge branch 'feat-zyq-1002844' into 'master'

解决空异常

See merge request rays/pcloud-book!699

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

@@ -66,6 +66,7 @@ import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 import com.pcloud.common.utils.ListUtils;
+import com.pcloud.common.utils.NumberUtil;
 import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.common.utils.string.StringUtilParent;
@@ -937,35 +938,43 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         }
         list = setAppletNews4Week(rightsSettingId, rightsType, wechatUserId, list);
         List<Long> rightsSettingItemIds =
-                list.stream().filter(e -> YesOrNoEnums.YES.getValue().equals(e.getIsOpen())).map(e -> e.getId()).collect(Collectors.toList());
+                list.stream().filter(e -> YesOrNoEnums.YES.getValue().equals(e.getIsOpen())
+                    && RightsNowItemType.ONLINE_REMIND.value.equals(e.getRightsClassifyId().intValue()))
+                    .map(e -> e.getId()).collect(Collectors.toList());
+
         if (!ListUtils.isEmpty(rightsSettingItemIds)) {
             List<RightsCustomRelation> rightsCustomRelations = rightsCustomRelationDao.getCustomByItemIds(rightsSettingItemIds);
             list = setReadPlan4Week(rightsCustomRelations, list);
-            setGroupActivity(list);
+        }
+
+        // 线上读书活动社群
+        rightsSettingItemIds = list.stream().filter(e -> YesOrNoEnums.YES.getValue().equals(e.getIsOpen())
+            && RightsNowItemType.ONLINE_READING_ACTIVITY.value.equals(e.getRightsClassifyId().intValue()))
+            .map(e -> e.getId()).collect(Collectors.toList());
+        if (!ListUtils.isEmpty(rightsSettingItemIds)) {
+            setGroupActivity(list, rightsSettingItemIds);
         }
         return list;
     }
 
-    private void setGroupActivity(List<RightsSettingItem> list){
+    private void setGroupActivity(List<RightsSettingItem> list, List<Long> rightsSettingItemIds){
         if(ListUtils.isEmpty(list)){
             return;
         }
-        List<Long> rightsSettingItemIds = list.stream().filter(e -> YesOrNoEnums.YES.getValue().equals(e.getIsOpen())
-            && RightsNowItemType.ONLINE_READING_ACTIVITY.value.equals(e.getRightsClassifyId().intValue()))
-            .map(e -> e.getId()).collect(Collectors.toList());
-        if(ListUtils.isEmpty(rightsSettingItemIds)){
-            return;
-        }
+        GroupActivity4AppletDTO groupActivity4AppletDTO = null;
         // 书刊分类
         BookAdviserDto bookAdviserDto = bookAdviserBiz.getOneMainBook(list.get(0).getBookId());
-        BaseTempletClassify baseTempletClassify = new BaseTempletClassify();
-        baseTempletClassify.setFirstClassify(bookAdviserDto.getTempletId());
-        baseTempletClassify.setSecondClassify(bookAdviserDto.getSecondTempletId());
-        baseTempletClassify.setGradeLabelId(bookAdviserDto.getGraLabelId());
-        baseTempletClassify.setSubjectLabelId(bookAdviserDto.getSubLabelId());
-        setClassifyAndLabel(baseTempletClassify);
-        // 通过书刊分类拿群
-        GroupActivity4AppletDTO groupActivity4AppletDTO = pcloudGroupActivityDao.getGroupActivity4Applet(baseTempletClassify.getFirstClassify(),baseTempletClassify.getSecondClassify(),baseTempletClassify.getGradeLabelId(),baseTempletClassify.getSubjectLabelId());
+        if(bookAdviserDto != null && NumberUtil.isNumber(bookAdviserDto.getTempletId())){
+            BaseTempletClassify baseTempletClassify = new BaseTempletClassify();
+            baseTempletClassify.setFirstClassify(bookAdviserDto.getTempletId());
+            baseTempletClassify.setSecondClassify(bookAdviserDto.getSecondTempletId());
+            baseTempletClassify.setGradeLabelId(bookAdviserDto.getGraLabelId());
+            baseTempletClassify.setSubjectLabelId(bookAdviserDto.getSubLabelId());
+            setClassifyAndLabel(baseTempletClassify);
+            // 通过书刊分类拿群
+            groupActivity4AppletDTO = pcloudGroupActivityDao.getGroupActivity4Applet(baseTempletClassify.getFirstClassify(),baseTempletClassify.getSecondClassify(),baseTempletClassify.getGradeLabelId(),baseTempletClassify.getSubjectLabelId());
+        }
+
         if(groupActivity4AppletDTO == null){
             // 如果书刊没拿到群，则通过权益分类拿群
             RightsSetting rightsSetting = rightsSettingDAO.selectByPrimaryKey(list.get(0).getRightsSettingId());