Merge branch 'feature/1004650' into 'master'

feat: [1004650] H5资源页配置第三方资源跳转小程序

See merge request rays/pcloud-book!1277

pcloud-facade-book/src/main/java/com/pcloud/book/applet/entity/AppletThirdResources.java

@@ -66,4 +66,7 @@ public class AppletThirdResources extends BaseEntity {
 
     @ApiModelProperty("推送图片")
     private List<String> picUrlList;
+
+    @ApiModelProperty("小程序原始id")
+    private String baseAppId;
 }
\ No newline at end of file

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

@@ -106,5 +106,8 @@ public class AppletThirdResourcesDTO extends BaseDto {
 
     @ApiModelProperty("推送图片")
     private List<String> picUrlList;
+
+    @ApiModelProperty("小程序原始id")
+    private String baseAppId;
 }
 

pcloud-service-book/src/main/resources/mapper/applet/AppletThirdResources.xml

@@ -21,11 +21,12 @@
         <result column="float_img_url" property="floatImgUrl" jdbcType="VARCHAR"/>
         <result column="button_img_url" property="buttonImgUrl" jdbcType="VARCHAR"/>
         <result column="show_type" property="showType" jdbcType="TINYINT"/>
+        <result column="base_app_id" property="baseAppId" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
     id,resource_number,resource_type,resource_name,app_Id,resource_source,resource_img_url,resource_url,remark,create_time,update_time,
-    creator,updator,route_code,guide,top_img_url,float_img_url,button_img_url,show_type
+    creator,updator,route_code,guide,top_img_url,float_img_url,button_img_url,show_type,base_app_id
   </sql>
 
 
@@ -75,7 +76,8 @@
             a.top_img_url topImgUrl,
             a.float_img_url floatImgUrl,
             a.button_img_url buttonImgUrl,
-            a.show_type showType
+            a.show_type showType,
+            a.base_app_id baseAppId
         from applet_third_resources a
         left join biz_material b on a.id = b.biz_id and b.biz_type = 1
         where 1=1
@@ -119,7 +121,8 @@
             a.float_img_url floatImgUrl,
             a.button_img_url buttonImgUrl,
             a.show_type showType,
-            a.resource_url AS appletsUrl
+            a.resource_url AS appletsUrl,
+            a.base_app_id baseAppId
         from applet_third_resources a
         left join biz_material b on a.id = b.biz_id and b.biz_type = 1
         where a.id=#{id}
@@ -146,7 +149,8 @@
         a.top_img_url topImgUrl,
         a.float_img_url floatImgUrl,
         a.button_img_url buttonImgUrl,
-        a.show_type showType
+        a.show_type showType,
+        a.base_app_id baseAppId
         from applet_third_resources a
         left join biz_material b on a.id = b.biz_id and b.biz_type = 1
         where a.id in
@@ -173,7 +177,8 @@
             third.top_img_url topImgUrl,
             third.float_img_url floatImgUrl,
             third.button_img_url buttonImgUrl,
-            third.show_type showType
+            third.show_type showType,
+            third.base_app_id baseAppId
         FROM
             applet_third_resources_relation relation
         right JOIN applet_third_resources third ON relation.third_resources_id = third.id
@@ -201,7 +206,8 @@
         n.creator,
         n.updator,
         GROUP_CONCAT(case when news.id != ' ' THEN news.id else null END) newsIds,
-        GROUP_CONCAT(case when news.url_number != ' ' THEN news.url_number else null END) newsNumber
+        GROUP_CONCAT(case when news.url_number != ' ' THEN news.url_number else null END) newsNumber,
+        n.base_app_id baseAppId
         FROM
         applet_third_resources n
         LEFT JOIN applet_third_resources_relation ralation ON n.id = ralation.third_resources_id
@@ -230,17 +236,16 @@
     insert into applet_third_resources ( resource_number,resource_type,resource_name,
         app_Id,resource_source,resource_img_url,
         resource_url,remark,create_time,
-        update_time,creator,updator,route_code,guide, top_img_url, float_img_url, button_img_url, show_type
+        update_time,creator,updator,route_code,guide, top_img_url, float_img_url, button_img_url, show_type,base_app_id
     )
     values (#{number,jdbcType=VARCHAR}, #{type,jdbcType=TINYINT}, #{name,jdbcType=VARCHAR},
        #{appletsId,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR}, #{resourceImgUrl,jdbcType=VARCHAR},
        #{url,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, now(),
        now(), #{creator,jdbcType=BIGINT}, #{updator,jdbcType=BIGINT},#{routeCode,jdbcType=TINYINT}, #{guide,jdbcType=VARCHAR},
-       #{topImgUrl}, #{floatImgUrl}, #{buttonImgUrl}, #{showType}
+       #{topImgUrl}, #{floatImgUrl}, #{buttonImgUrl}, #{showType}, #{baseAppId}
     )
   </insert>
 
-
     <update id="update" parameterType="com.pcloud.book.applet.entity.AppletThirdResources">
         update applet_third_resources
         <set>
@@ -287,6 +292,9 @@
                 show_type = #{showType},
             </if>
             update_time = NOW(),
+            <if test="baseAppId != null">
+                base_app_id = #{baseAppId},
+            </if>
         </set>
         where id = #{id,jdbcType=BIGINT}
     </update>