Commit e99de4de by guiq

feat: [1006247] 【优化】未开启小睿流程时:支持顶部模块修改透明度

parent fa0694a5
......@@ -74,4 +74,8 @@ public class ResourcePageDTO extends BaseDto {
@ApiModelProperty("RAYS码落地页类型1本书服务2企微")
private Integer landingPageType;
/**
* 透明度
*/
private Integer transparency;
}
......@@ -369,6 +369,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePage.setFontColor(updateResourcePageVO.getFontColor());
resourcePage.setWatermark(updateResourcePageVO.getWatermark());
resourcePage.setWatermarkStyle(updateResourcePageVO.getWatermarkStyle());
resourcePage.setTransparency(updateResourcePageVO.getTransparency());
resourcePageDao.update(resourcePage);
}
if (updateResourcePageVO.getOpenRays() == 1) {
......@@ -439,6 +440,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePage.setFontColor(updateResourcePageVO.getFontColor());
resourcePage.setWatermark(updateResourcePageVO.getWatermark());
resourcePage.setWatermarkStyle(updateResourcePageVO.getWatermarkStyle());
resourcePage.setTransparency(updateResourcePageVO.getTransparency());
resourcePageDao.update(resourcePage);
}
if (updateResourcePageVO.getOpenRays() == 1) {
......@@ -1770,6 +1772,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePageVO.setWatermark(resourcePage.getWatermark());
resourcePageVO.setWatermarkStyle(resourcePage.getWatermarkStyle());
resourcePageVO.setLandingPageType(resourcePage.getLandingPageType());
resourcePageVO.setTransparency(resourcePage.getTransparency());
}
return resourcePageVO;
}
......@@ -1823,6 +1826,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePageVO.setWatermark(resourcePage.getWatermark());
resourcePageVO.setWatermarkStyle(resourcePage.getWatermarkStyle());
resourcePageVO.setLandingPageType(resourcePage.getLandingPageType());
resourcePageVO.setTransparency(resourcePage.getTransparency());
}
return resourcePageVO;
}
......
......@@ -91,4 +91,8 @@ public class ResourcePage extends BaseEntity {
@ApiModelProperty("RAYS码落地页类型1本书服务2企微")
private Integer landingPageType;
/**
* 透明度
*/
private Integer transparency;
}
......@@ -124,4 +124,8 @@ public class ResourcePageVO extends BaseDto {
private Integer landingPageType;
@ApiModelProperty("企业微信落地页信息")
private WxworkPageVO wxworkPageVO;
/**
* 透明度
*/
private Integer transparency;
}
......@@ -81,5 +81,8 @@ public class UpdateResourcePageVO {
@ApiModelProperty("RAYS码落地页类型1本书服务2企微")
private Integer landingPageType;
/**
* 透明度 非小睿码生效
*/
private Integer transparency;
}
......@@ -25,11 +25,13 @@
<result property="watermark" column="watermark" jdbcType="VARCHAR"/>
<result property="watermarkStyle" column="watermark_style" jdbcType="TINYINT"/>
<result property="landingPageType" column="landing_page_type" jdbcType="INTEGER"/>
<result property="transparency" column="transparency" jdbcType="INTEGER"/>
</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
</sql>
<!--查询单个-->
......@@ -44,9 +46,9 @@
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into book.resource_page(book_group_id, style, show_book, open_rays, open_food, create_time, update_time, create_user,
qrcode_url, scene_id, book_cover, book_id, channel_id, background_img, font_color, watermark, watermark_style, landing_page_type)
qrcode_url, scene_id, book_cover, book_id, channel_id, background_img, font_color, watermark, watermark_style, landing_page_type, transparency)
values (#{bookGroupId}, #{style}, #{showBook}, #{openRays}, IFNULL(#{openFood},0), now(), now(), #{createUser}, #{qrcodeUrl}, #{sceneId}, #{bookCover},
#{bookId}, #{channelId}, #{backgroundImg}, #{fontColor}, #{watermark}, #{watermarkStyle}, IFNULL(#{landingPageType},1))
#{bookId}, #{channelId}, #{backgroundImg}, #{fontColor}, #{watermark}, #{watermarkStyle}, IFNULL(#{landingPageType},1), IFNULL(#{transparency},0))
</insert>
<!--通过主键修改数据-->
......@@ -89,6 +91,9 @@
<if test="landingPageType != null">
landing_page_type = #{landingPageType},
</if>
<if test="transparency != null">
transparency = #{transparency},
</if>
</set>
where id = #{id}
</update>
......@@ -119,7 +124,8 @@
p.background_img,
p.navigation_color,
p.navigation_format,
p.font_color
p.font_color,
p.transparency
FROM
resource_page p
LEFT JOIN resource_page_item i ON p.id = i.resource_page_id
......@@ -156,7 +162,7 @@
<select id="getPageByOfficialScene" parameterType="long" resultMap="ResourcePageMap">
select
id, book_group_id, style, show_book, open_rays, open_food, qrcode_url, scene_id, official_scene_id, book_cover
id, book_group_id, style, show_book, open_rays, open_food, qrcode_url, scene_id, official_scene_id, book_cover,transparency
from book.resource_page
where official_scene_id = #{officialSceneId}
limit 1
......@@ -197,7 +203,8 @@
p.qrcode_url,
p.scene_id,
p.book_cover,
p.official_scene_id
p.official_scene_id,
p.transparency
FROM
resource_page_column c
LEFT JOIN resource_page p ON c.resource_page_id = p.id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment