Merge branch 'fixbug/1026453' into 'master'

bug: [1026453] 周权益应用收藏未展示

See merge request rays/pcloud-book!1043

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

@@ -2022,6 +2022,8 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         }
         // 处理馆配图书
         processLibraryBook(bookId, adviserId, rightsSettingDto);
+        //填充收藏
+        fillCollect(wechatUserId, rightsSettingDto, RightsNowItemTypeNew.ONLINE_REMIND.value);
         return rightsSettingDto;
     }
 
@@ -2397,6 +2399,14 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
             if (null != rightsSetting4Serves.getLearningToolTitle() && !ListUtils.isEmpty(rightsSetting4Serves.getLearningToolTitle().getRightsSettingItemList())){
                 rightsNowItemList = rightsSetting4Serves.getLearningToolTitle().getRightsSettingItemList();
             }
+        } else if (RightsNowItemTypeNew.ONLINE_REMIND.value.equals(type)) {
+            if (!ListUtils.isEmpty(rightsSetting4Serves.getRightsSettingWeekItems())){
+                for (RightsSettingItem rightsSettingItem : rightsSetting4Serves.getRightsSettingWeekItems()) {
+                    if (!ListUtils.isEmpty(rightsSettingItem.getRightsSettingItemList4Serve())) {
+                        rightsNowItemList.addAll(rightsSettingItem.getRightsSettingItemList4Serve());
+                    }
+                }
+            }
         }
         if (!ListUtils.isEmpty(rightsNowItemList)) {
             fillCollect4RightsNowItem(wechatUserId,rightsNowItemList);