Merge branch 'feature/1003186' into 'master'

feat: [1003186] 本书立享权益客户端样式问题

See merge request rays/pcloud-book!821

pcloud-service-book/src/main/java/com/pcloud/book/applet/dto/AppletNewsDTO.java

@@ -97,7 +97,8 @@ public class AppletNewsDTO extends BaseDto {
     private Integer showLink;
     @ApiModelProperty("浏览量pv")
     private Integer browseCount;
-
     @ApiModelProperty("选取的服务")
     List<AppletNewsServeDTO> appletNewsServeList;
+    @ApiModelProperty("文章版式（1多图文2单图文3纯图片4纯文本)")
+    private Integer newsType;
 }

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

@@ -832,6 +832,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                     if (appletNewsDTO == null) {
                         continue;
                     }
+                    appletNewsDTO.setNewsType(appletNewsDTO.getType());
                     rightsSettingItem.getAppletNewsDTOS().add(appletNewsDTO);
                 }
             } else if (!ListUtils.isEmpty(itemDetailList) && RightsServeTypeEnum.PLAN.name()
@@ -1219,12 +1220,17 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                         item.setSource(appletNewsDTO.getSource());
                         // item的type字段跟appletNewsDTO的type字段有些冲突，前端会根据type来展示不同的样式
                         //item.setType(appletNewsDTO.getType());
+                        item.setNewsType(appletNewsDTO.getType());
                         item.setServeId(appletNewsDTO.getId());
                         item.setServePic(appletNewsDTO.getPic1());
                         item.setServeName(appletNewsDTO.getNewsName());
                         item.setServeTypeName("资讯");
                         item.setJumpType(appletNewsDTO.getJumpType());
                         item.setJumpUrl(appletNewsDTO.getJumpUrl());
+                        item.setPic1(appletNewsDTO.getPic1());
+                        item.setPic2(appletNewsDTO.getPic2());
+                        item.setPic3(appletNewsDTO.getPic3());
+                        item.setDigest(appletNewsDTO.getDigest());
                     }
                 }
             }
@@ -1783,7 +1789,6 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                 groupActivity4AppletDTOList = pcloudGroupActivityBiz.getTishBookSchoolListWrap(baseTempletClassify, top);
             }
         }
-
         if (ListUtils.isEmpty(groupActivity4AppletDTOList)) {
             // 如果书刊没拿到群，则通过权益分类拿群
             RightsSetting rightsSetting = rightsSettingDAO.selectByPrimaryKey(rightsSettingId);

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

@@ -97,5 +97,15 @@ public class RightsNowItem extends BaseEntity {
     private BigDecimal price;
     @ApiModelProperty("群类型 2:编辑端群")
     private String groupType;
+    @ApiModelProperty("文章版式（1多图文2单图文3纯图片4纯文本)")
+    private Integer newsType;
+    @ApiModelProperty("预览图片1")
+    private String pic1;
+    @ApiModelProperty("预览图片2")
+    private String pic2;
+    @ApiModelProperty("预览图片3")
+    private String pic3;
+    @ApiModelProperty("内容摘要")
+    private String digest;
 
 }