Merge branch 'feature/1005436' into 'master'

feat:[1005436]配置H5页面，增加字体颜色配置

See merge request rays/pcloud-book!1414

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

@@ -230,6 +230,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             //校验能否开启小睿
             this.checkOpenRays(resourcePage.getBookId(), updateResourcePageVO.getOpenRays());
             resourcePage.setBackgroundImg(updateResourcePageVO.getBackgroundImg());
+            resourcePage.setFontColor(updateResourcePageVO.getFontColor());
             resourcePageDao.update(resourcePage);
         }
         if (updateResourcePageVO.getOpenRays() == 1) {
@@ -295,6 +296,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePage.setBackgroundImg(updateResourcePageVO.getBackgroundImg());
             resourcePage.setBookId(null == dto?null:dto.getBookId());
             resourcePage.setChannelId(null == dto?null:dto.getChannelId());
+            resourcePage.setFontColor(updateResourcePageVO.getFontColor());
             resourcePageDao.update(resourcePage);
         }
         if (updateResourcePageVO.getOpenRays() == 1) {
@@ -1489,6 +1491,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setBackgroundImg(resourcePage.getBackgroundImg());
             resourcePageVO.setNavigationColor(resourcePage.getNavigationColor());
             resourcePageVO.setNavigationFormat(resourcePage.getNavigationFormat());
+            resourcePageVO.setFontColor(resourcePage.getFontColor());
         }
         return resourcePageVO;
     }
@@ -1532,6 +1535,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setBackgroundImg(resourcePage.getBackgroundImg());
             resourcePageVO.setNavigationColor(resourcePage.getNavigationColor());
             resourcePageVO.setNavigationFormat(resourcePage.getNavigationFormat());
+            resourcePageVO.setFontColor(resourcePage.getFontColor());
         }
         return resourcePageVO;
     }

pcloud-service-book/src/main/java/com/pcloud/book/group/entity/ResourcePage.java

@@ -74,4 +74,8 @@ public class ResourcePage extends BaseEntity {
      * 导航版式
      */
     private Integer navigationFormat;
+    /**
+     * 字体颜色
+     */
+    private String fontColor;
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageVO.java

@@ -107,4 +107,8 @@ public class ResourcePageVO extends BaseDto {
      * 导航版式
      */
     private Integer navigationFormat;
+    /**
+     * 字体颜色
+     */
+    private String fontColor;
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/UpdateResourcePageVO.java

@@ -62,4 +62,8 @@ public class UpdateResourcePageVO {
 
     @ApiModelProperty("实体书购买")
     private List<ResourcePageBookstore> resourcePageBookstoreList;
+    /**
+     * 字体颜色
+     */
+    private String fontColor;
 }

pcloud-service-book/src/main/resources/mapper/group/ResourcePageDao.xml

@@ -21,11 +21,12 @@
         <result property="backgroundImg" column="background_img" jdbcType="VARCHAR"/>
         <result property="navigationColor" column="navigation_color" jdbcType="INTEGER"/>
         <result property="navigationFormat" column="navigation_format" jdbcType="INTEGER"/>
+        <result property="fontColor" column="font_color" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
          id, book_group_id, style, show_book, open_rays, open_food, create_time, update_time, create_user, qrcode_url, scene_id, official_scene_id,
-          book_cover, book_id, channel_id, background_img, navigation_color, navigation_format
+          book_cover, book_id, channel_id, background_img, navigation_color, navigation_format, font_color
     </sql>
 
     <!--查询单个-->
@@ -40,9 +41,9 @@
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into book.resource_page(book_group_id, style, show_book, open_rays, open_food, create_time, update_time, create_user,
-         qrcode_url, scene_id, book_cover, book_id, channel_id, background_img)
+         qrcode_url, scene_id, book_cover, book_id, channel_id, background_img, font_color)
         values (#{bookGroupId}, #{style}, #{showBook}, #{openRays}, IFNULL(#{openFood},0), now(), now(), #{createUser}, #{qrcodeUrl}, #{sceneId}, #{bookCover},
-        #{bookId}, #{channelId}, #{backgroundImg})
+        #{bookId}, #{channelId}, #{backgroundImg}, #{fontColor})
     </insert>
 
     <!--通过主键修改数据-->
@@ -79,6 +80,7 @@
                 book_cover = #{bookCover},
                 update_time = NOW(),
                 background_img = #{backgroundImg},
+                font_color = #{fontColor},
         </set>
         where id = #{id}
     </update>
@@ -108,7 +110,8 @@
         p.scene_id,
         p.background_img,
         p.navigation_color,
-        p.navigation_format
+        p.navigation_format,
+        p.font_color
         FROM
         resource_page p
         LEFT JOIN resource_page_item i ON p.id = i.resource_page_id