Merge branch 'feature/1006403' into 'master'

feat: [1006403] 【优化】市场反馈：本书服务页已购标识及价格展示开关

See merge request rays/pcloud-book!1497

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

@@ -385,6 +385,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePage.setWatermark(updateResourcePageVO.getWatermark());
             resourcePage.setWatermarkStyle(updateResourcePageVO.getWatermarkStyle());
             resourcePage.setTransparency(updateResourcePageVO.getTransparency());
+            resourcePage.setIsShowPrice(updateResourcePageVO.getIsShowPrice());
             resourcePageDao.update(resourcePage);
         }
         if (updateResourcePageVO.getOpenRays() == 1) {
@@ -456,6 +457,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePage.setWatermark(updateResourcePageVO.getWatermark());
             resourcePage.setWatermarkStyle(updateResourcePageVO.getWatermarkStyle());
             resourcePage.setTransparency(updateResourcePageVO.getTransparency());
+            resourcePage.setIsShowPrice(updateResourcePageVO.getIsShowPrice());
             resourcePageDao.update(resourcePage);
         }
         if (updateResourcePageVO.getOpenRays() == 1) {
@@ -1906,6 +1908,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setWatermarkStyle(resourcePage.getWatermarkStyle());
             resourcePageVO.setLandingPageType(resourcePage.getLandingPageType());
             resourcePageVO.setTransparency(resourcePage.getTransparency());
+            resourcePageVO.setIsShowPrice(resourcePage.getIsShowPrice());
         }
         return resourcePageVO;
     }
@@ -1961,6 +1964,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setLandingPageType(resourcePage.getLandingPageType());
             resourcePageVO.setTransparency(resourcePage.getTransparency());
             resourcePageVO.setNavigationJumpType(resourcePage.getNavigationJumpType());
+            resourcePageVO.setIsShowPrice(resourcePage.getIsShowPrice());
         }
         return resourcePageVO;
     }

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

@@ -100,4 +100,9 @@ public class ResourcePage extends BaseEntity {
      * 导航使用场景；1：菜单切换；2：功能跳转
      */
     private Integer navigationJumpType;
+
+    /**
+     * 是否展示价格
+     */
+    private Integer isShowPrice;
 }

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

@@ -135,4 +135,9 @@ public class ResourcePageVO extends BaseDto {
      * 导航使用场景；1：菜单切换；2：功能跳转
      */
     private Integer navigationJumpType;
+
+    /**
+     * 是否展示价格
+     */
+    private Integer isShowPrice;
 }

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

@@ -88,4 +88,9 @@ public class UpdateResourcePageVO {
      * 透明度 非小睿码生效
      */
     private Integer transparency;
+
+    /**
+     * 是否展示价格
+     */
+    private Integer isShowPrice;
 }

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

@@ -27,12 +27,13 @@
         <result property="landingPageType" column="landing_page_type" jdbcType="INTEGER"/>
         <result property="transparency" column="transparency" jdbcType="INTEGER"/>
         <result property="navigationJumpType" column="navigation_jump_type" jdbcType="INTEGER"/>
+        <result property="isShowPrice" column="is_show_price" jdbcType="TINYINT"/>
     </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, font_color,watermark, watermark_style, landing_page_type
-         ,transparency, navigation_jump_type
+         ,transparency, navigation_jump_type, is_show_price
     </sql>
 
     <!--查询单个-->
@@ -98,6 +99,9 @@
             <if test="navigationJumpType != null">
                 navigation_jump_type = #{navigationJumpType},
             </if>
+            <if test="isShowPrice != null">
+                is_show_price = #{isShowPrice},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -130,7 +134,8 @@
         p.navigation_format,
         p.font_color,
         p.transparency,
-        p.navigation_jump_type
+        p.navigation_jump_type,
+        p.is_show_price
         FROM
         resource_page p
         LEFT JOIN resource_page_item i ON p.id = i.resource_page_id