Merge branch 'feature/1009346' into 'master'

feat: [1009346] 二维码自定义页面新增热区功能

See merge request rays/pcloud-book!1711

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

@@ -85,5 +85,10 @@ public class ResourcePageWxwork extends BaseEntity {
      */
     private Boolean oldTemplate;
 
+    /**
+     * 跳转地址
+     */
+    private String turnUrl;
+
 }
 

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

@@ -75,4 +75,9 @@ public class WxworkPageCreateVO {
      * 存储落地页 - 自定义类型的前端配置
      */
     private Map<String,Object> config;
+
+    /**
+     * 跳转地址
+     */
+    private String turnUrl;
 }

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

@@ -85,4 +85,9 @@ public class WxworkPageVO extends BaseDto {
      * 是否旧模板 - 旧数据标识
      */
     private Boolean oldTemplate;
+
+    /**
+     * 跳转地址
+     */
+    private String turnUrl;
 }

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

@@ -20,10 +20,11 @@
         <result property="createUser" column="create_user" jdbcType="INTEGER"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="turnUrl" column="turn_url" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_columns">
-        id, resource_page_id, template_type, display_book, guide, qrcode_type, qrcode_id, qrcode_url, base_pic, top_space, left_space, html_pic, fixed_set, is_old_template, create_user, create_time, update_time
+        id, resource_page_id, template_type, display_book, guide, qrcode_type, qrcode_id, qrcode_url, base_pic, top_space, left_space, html_pic, fixed_set, is_old_template, create_user, create_time, update_time,turn_url
     </sql>
 
     <!--查询单个-->
@@ -36,8 +37,8 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into resource_page_wxwork(resource_page_id, template_type, display_book, guide, qrcode_type, qrcode_id, qrcode_url, base_pic, top_space, left_space, html_pic, fixed_set, is_old_template, create_user, create_time, update_time)
-        values (#{resourcePageId}, #{templateType}, #{displayBook}, #{guide}, #{qrcodeType}, #{qrcodeId}, #{qrcodeUrl}, #{basePic}, #{topSpace}, #{leftSpace}, #{htmlPic}, #{fixedSet}, 0, #{createUser}, now(), now())
+        insert into resource_page_wxwork(resource_page_id, template_type, display_book, guide, qrcode_type, qrcode_id, qrcode_url, base_pic, top_space, left_space, html_pic, fixed_set, is_old_template, create_user, create_time, update_time,turn_url)
+        values (#{resourcePageId}, #{templateType}, #{displayBook}, #{guide}, #{qrcodeType}, #{qrcodeId}, #{qrcodeUrl}, #{basePic}, #{topSpace}, #{leftSpace}, #{htmlPic}, #{fixedSet}, 0, #{createUser}, now(), now(),#{turnUrl})
     </insert>
 
     <!--通过主键修改数据-->
@@ -60,6 +61,9 @@
             <if test="qrcodeUrl != null and qrcodeUrl != ''">
                 qrcode_url = #{qrcodeUrl},
             </if>
+            <if test="turnUrl != null and turnUrl != ''">
+                turn_url = #{turnUrl},
+            </if>
                 is_old_template = 0,
                 base_pic = #{basePic},
                 top_space = #{topSpace},