Commit c71d04ae by Administrator

Merge branch 'fixbug/h5' into 'master'

feat:[1004458]H5落地页改版,以及板式自定义配置

See merge request rays/pcloud-book!1265
parents 45cf26cc ab974681
...@@ -239,9 +239,9 @@ public class ResourcePageBizImpl implements ResourcePageBiz { ...@@ -239,9 +239,9 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
//预览二维码 //预览二维码
String qrcodeLink; String qrcodeLink;
if (null != bookGroupId) { if (null != bookGroupId) {
qrcodeLink = "https://wechat666.raysgo.com/rayh5/book?bookGroupId="+bookGroupId; qrcodeLink = BookProps.getWechatDomain()+"/rayh5/book?bookGroupId="+bookGroupId;
} else { } else {
qrcodeLink = "https://wechat666.raysgo.com/rayh5/book?sceneId="+sceneId; qrcodeLink = BookProps.getWechatDomain()+"/rayh5/book?sceneId="+sceneId;
} }
resourcePageDao.insert(resourcePage); resourcePageDao.insert(resourcePage);
ThreadPoolUtils.OTHER_POOL.execute(()->{ ThreadPoolUtils.OTHER_POOL.execute(()->{
...@@ -1253,7 +1253,6 @@ public class ResourcePageBizImpl implements ResourcePageBiz { ...@@ -1253,7 +1253,6 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
if (null == resourcePage) { if (null == resourcePage) {
continue; continue;
} }
if (StringUtil.isEmpty(resourcePage.getQrcodeUrl())) {
//预览二维码 //预览二维码
String qrcodeLink = BookProps.getWechatDomain()+"/rayh5/book?bookGroupId="+bookGroupId; String qrcodeLink = BookProps.getWechatDomain()+"/rayh5/book?bookGroupId="+bookGroupId;
String qrcodeUrl = QrcodeUtils.createWithMargin(qrcodeLink, 1); String qrcodeUrl = QrcodeUtils.createWithMargin(qrcodeLink, 1);
...@@ -1261,6 +1260,5 @@ public class ResourcePageBizImpl implements ResourcePageBiz { ...@@ -1261,6 +1260,5 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePageDao.update(resourcePage); resourcePageDao.update(resourcePage);
} }
} }
}
} }
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