Merge branch 'fix-zyq-1023490' into 'master'

1023490 立享权益bug

See merge request rays/pcloud-book!747

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

@@ -905,8 +905,6 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         }
         List<RightsNowItem> nowItems = rightsNowItemDao.getListByRightsSettingId(rightsSetting.getId(), types);
         if (!ListUtils.isEmpty(nowItems)) {
-            // 填充应用、作品、社群、资讯
-            fillProductAndApp(nowItems);
             rightsSettingTitler4Online.setRightsSettingItemList(
                     nowItems.stream().filter(s -> RightsNowItemType.ONLINE_COURSE.value.equals(s.getType())).collect(Collectors.toList()));
             rightsSettingTitler4Learningtool.setRightsSettingItemList(
@@ -915,6 +913,8 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                     nowItems.stream().filter(s -> RightsNowItemType.DRAW.value.equals(s.getType())).collect(Collectors.toList()));
             rightsSettingTitler4Group.setRightsSettingItemList(
                     nowItems.stream().filter(s -> RightsNowItemType.GROUP_SERVICE.value.equals(s.getType()) && s.getServeType() != null).collect(Collectors.toList()));
+            // 填充应用、作品、社群、资讯
+            fillProductAndApp(nowItems);
         }
         rightsSetting.setOnlineRightsSettingTitle(rightsSettingTitler4Online);
         rightsSetting.setLearningToolTitle(rightsSettingTitler4Learningtool);
@@ -1035,6 +1035,8 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                     if(appletNewsDTO != null){
                         item.setNewsName(appletNewsDTO.getNewsName());
                         item.setNewsSource(appletNewsDTO.getSource());
+                        item.setSource(appletNewsDTO.getSource());
+                        // item的type字段跟appletNewsDTO的type字段有些冲突，前端会根据type来展示不同的样式
                         item.setType(appletNewsDTO.getType());
 
                         item.setServeId(appletNewsDTO.getId());

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/entity/RightsNowItem.java

@@ -79,7 +79,9 @@ public class RightsNowItem extends BaseEntity {
     private GroupActivity4AppletDTO groupActivity4AppletDTO;
     @ApiModelProperty("资讯名称")
     private String newsName;
-    @ApiModelProperty("资讯图")
+    @ApiModelProperty("来源")
     private String newsSource;
+    @ApiModelProperty("来源")
+    private String source;
 
 }