Merge branch 'feature/1003632' into 'master'

feat: [1003632] 资讯页面第三方资源配置资讯页展示

See merge request rays/pcloud-book!980

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

@@ -92,5 +92,17 @@ public class AppletThirdResourcesDTO extends BaseDto {
 
     private List<AppletChartDateDTO> browseList;
 
+    @ApiModelProperty("顶图")
+    private String topImgUrl;
+
+    @ApiModelProperty("浮动图")
+    private String floatImgUrl;
+
+    @ApiModelProperty("按钮图")
+    private String buttonImgUrl;
+
+    @ApiModelProperty("位置 1 顶部 2 底部")
+    private Integer showType;
+
 }
 

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

@@ -46,4 +46,16 @@ public class AppletThirdResources extends BaseEntity {
     @ApiModelProperty("素材地址")
     private String materialUrl;
 
+    @ApiModelProperty("顶图")
+    private String topImgUrl;
+
+    @ApiModelProperty("浮动图")
+    private String floatImgUrl;
+
+    @ApiModelProperty("按钮图")
+    private String buttonImgUrl;
+
+    @ApiModelProperty("位置 1 顶部 2 底部")
+    private Integer showType;
+
 }
\ No newline at end of file

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

@@ -17,10 +17,15 @@
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
         <result column="route_code" property="routeCode" jdbcType="TINYINT"/>
         <result column="guide" property="guide" jdbcType="VARCHAR"/>
+        <result column="top_img_url" property="topImgUrl" jdbcType="VARCHAR"/>
+        <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"/>
     </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
+    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
   </sql>
 
 
@@ -66,7 +71,11 @@
             a.updator AS updateTime,
             a.route_code AS routeCode,
             a.guide AS guide,
-            b.material_url AS materialUrl
+            b.material_url AS materialUrl,
+            a.top_img_url topImgUrl,
+            a.float_img_url floatImgUrl,
+            a.button_img_url buttonImgUrl,
+            a.show_type showType
         from applet_third_resources a
         left join biz_material b on a.id = b.biz_id and b.biz_type = 1
         where 1=1
@@ -101,7 +110,12 @@
             bm.material_url materialUrl,
             third.route_code routeCode,
             third.guide,
-            third.resource_source source
+            third.resource_source source,
+            third.guide,
+            third.top_img_url topImgUrl,
+            third.float_img_url floatImgUrl,
+            third.button_img_url buttonImgUrl,
+            third.show_type showType
         FROM
             applet_third_resources_relation relation
         LEFT JOIN applet_third_resources third ON relation.third_resources_id = third.id
@@ -158,12 +172,13 @@
     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
+        update_time,creator,updator,route_code,guide, top_img_url, float_img_url, button_img_url, show_type
     )
     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}
+       now(), #{creator,jdbcType=BIGINT}, #{updator,jdbcType=BIGINT},#{routeCode,jdbcType=TINYINT}, #{guide,jdbcType=VARCHAR},
+       #{topImgUrl}, #{floatImgUrl}, #{buttonImgUrl}, #{showType}
     )
   </insert>
 
@@ -201,6 +216,18 @@
             <if test="guide != null">
                 guide = #{guide,jdbcType=VARCHAR},
             </if>
+            <if test="topImgUrl != null">
+                top_img_url = #{topImgUrl},
+            </if>
+            <if test="floatImgUrl != null">
+                float_img_url = #{floatImgUrl},
+            </if>
+            <if test="buttonImgUrl != null">
+                button_img_url = #{buttonImgUrl},
+            </if>
+            <if test="showType != null">
+                show_type = #{showType},
+            </if>
             update_time = NOW(),
         </set>
         where id = #{id,jdbcType=BIGINT}