Merge branch 'feature/1006243' into 'master'

feat: [1006243] 会员背景图

See merge request rays/pcloud-book!1480

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

@@ -56,4 +56,14 @@ public class ResourcePageColumn extends BaseEntity {
      * 导航id
      */
     private Long navigationId;
+
+    /**
+     * 背景图类型
+     */
+    private Integer backgroundType;
+
+    /**
+     * 背景图地址
+     */
+    private String backgroundUrl;
 }
\ No newline at end of file

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

@@ -97,4 +97,14 @@ public class ResourceColumnAndServeVO extends BaseDto{
      * 导航id
      */
     private Long navigationId;
+
+    /**
+     * 背景图类型
+     */
+    private Integer backgroundType;
+
+    /**
+     * 背景图地址
+     */
+    private String backgroundUrl;
 }

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

@@ -74,4 +74,14 @@ public class UpdateResourceColumnVO {
      * 渠道id
      */
     private Long channelId;
+
+    /**
+     * 背景图类型
+     */
+    private Integer backgroundType;
+
+    /**
+     * 背景图地址
+     */
+    private String backgroundUrl;
 }

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

@@ -80,4 +80,6 @@ public class UpdateResourcePageVO {
 
     @ApiModelProperty("RAYS码落地页类型1本书服务2企微")
     private Integer landingPageType;
+
+
 }

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

@@ -16,6 +16,8 @@
         <result property="createUser" column="create_user" jdbcType="INTEGER"/>
         <result property="labelIcon" column="label_icon" jdbcType="VARCHAR"/>
         <result property="navigationId" column="navigation_id" jdbcType="INTEGER"/>
+        <result property="backgroundType" column="background_type" jdbcType="INTEGER"/>
+        <result property="backgroundUrl" column="background_url" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="ResourceColumnAndServe" type="com.pcloud.book.group.vo.ResourceColumnAndServeVO">
@@ -29,12 +31,14 @@
         <result property="showMore" column="show_more" jdbcType="BOOLEAN"/>
         <result property="labelIcon" column="label_icon" jdbcType="VARCHAR"/>
         <result property="navigationId" column="navigation_id" jdbcType="INTEGER"/>
+        <result property="backgroundType" column="background_type" jdbcType="INTEGER"/>
+        <result property="backgroundUrl" column="background_url" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
     <select id="getById" resultMap="ResourcePageColumnMap">
         select
-          id, resource_page_id, column_type, column_name, column_format, column_seq, show_more,show_count, create_time, label_icon, navigation_id
+          id, resource_page_id, column_type, column_name, column_format, column_seq, show_more,show_count, create_time, label_icon, navigation_id,background_type,background_url
         from book.resource_page_column
         where id = #{id}
     </select>
@@ -42,9 +46,9 @@
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into book.resource_page_column(resource_page_id, column_type, column_name, column_format, column_seq,
-         show_more, show_count, create_time, update_time, create_user, label_icon, navigation_id)
+         show_more, show_count, create_time, update_time, create_user, label_icon, navigation_id,background_type,background_url)
         values (#{resourcePageId}, #{columnType}, #{columnName}, #{columnFormat}, #{columnSeq},
-        #{showMore}, #{showCount}, now(), now(), #{createUser}, #{labelIcon}, #{navigationId})
+        #{showMore}, #{showCount}, now(), now(), #{createUser}, #{labelIcon}, #{navigationId},#{backgroundType}, #{backgroundUrl})
     </insert>
 
     <!--通过主键修改数据-->
@@ -74,6 +78,12 @@
             <if test="navigationId != null">
                 navigation_id = #{navigationId},
             </if>
+            <if test="backgroundType != null">
+                background_type = #{backgroundType},
+            </if>
+            <if test="backgroundUrl != null">
+                background_url = #{backgroundUrl},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -96,16 +106,18 @@
 
     <select id="getColumnListByPageId" resultMap="ResourceColumnAndServe" parameterType="map">
         SELECT
-            resource_page_id,
-            id,
-            column_type,
-            column_name,
-            column_format,
-            column_seq,
-            show_count,
-            show_more,
-            label_icon,
-            navigation_id
+        resource_page_id,
+        id,
+        column_type,
+        column_name,
+        column_format,
+        column_seq,
+        show_count,
+        show_more,
+        label_icon,
+        navigation_id,
+        background_type,
+        background_url
         FROM
             resource_page_column
         WHERE
@@ -120,7 +132,7 @@
 
     <select id="getByColumnTypeAndPage" parameterType="map" resultMap="ResourcePageColumnMap">
          select
-          id, resource_page_id, column_type, column_name, column_format, column_seq, show_more, show_count, create_time, navigation_id
+          id, resource_page_id, column_type, column_name, column_format, column_seq, show_more, show_count, create_time, navigation_id, background_type, background_url
         from book.resource_page_column
         where resource_page_id = #{resourcePageId}
         and column_type = #{columnType}
@@ -135,7 +147,7 @@
 
     <select id="getColumByMoveType" parameterType="map" resultMap="ResourcePageColumnMap">
         SELECT
-        id, resource_page_id, column_type, column_name, column_format, column_seq, show_more, show_count, create_time, navigation_id
+        id, resource_page_id, column_type, column_name, column_format, column_seq, show_more, show_count, create_time, navigation_id,background_type, background_url
         FROM
         book.resource_page_column
         WHERE
@@ -179,7 +191,7 @@
 
     <select id="getByNavigation" resultMap="ResourcePageColumnMap" parameterType="long">
          select
-          id, resource_page_id, column_type, column_name, column_format, column_seq, show_more,show_count, create_time, label_icon, navigation_id
+          id, resource_page_id, column_type, column_name, column_format, column_seq, show_more,show_count, create_time, label_icon, navigation_id, background_type, background_url
         from book.resource_page_column
         where navigation_id = #{navigationId}
     </select>