Merge branch 'fixbug/page' into 'master'

bug: [none] 跳转链接判断

See merge request rays/pcloud-book!1341

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

@@ -611,6 +611,8 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 itemVOList = resourcePageItemDao.getResourcePageItemByPageId(resourcePageId, null);
             }
             if (CollUtil.isNotEmpty(itemVOList)) {
+                //二维码类型
+                fillQrcodeType(resourcePageId, itemVOList);
                 Map<String, List<ResourcePageItemVO>> listMap = itemVOList.stream().collect(Collectors.groupingBy(ResourcePageItemVO::getServeType));
                 for (Map.Entry<String, List<ResourcePageItemVO>> entry : listMap.entrySet()) {
                     this.fillResourceByType(entry.getValue(), isWechat, entry.getKey());
@@ -644,6 +646,29 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
     }
 
     /**
+     * 二维码类型
+     */
+    private void fillQrcodeType(Long resourcePageId, List<ResourcePageItemVO> itemVOList) {
+        String qrcodeType = "";
+        ResourcePage resourcePage = resourcePageDao.getById(resourcePageId);
+        if (null == resourcePage || ListUtils.isEmpty(itemVOList)) {
+           return;
+        }
+        Integer jumpType = null;
+        if (null != resourcePage.getBookGroupId()) {
+            qrcodeType = "own";
+            BookGroupDTO bookGroupDTO = bookGroupDao.getDTOById(resourcePage.getBookGroupId());
+            jumpType = null == bookGroupDTO? null:bookGroupDTO.getJumpType();
+        } else if (null != resourcePage.getSceneId()) {
+            QrcodeSceneDto qrcodeSceneDto = qrcodeSceneConsr.getById(resourcePage.getSceneId());
+            qrcodeType = null == qrcodeSceneDto?"ali":qrcodeSceneDto.getQrcodeType();
+        }
+        for (ResourcePageItemVO itemVO:itemVOList) {
+            itemVO.setQrcodeType(qrcodeType);
+            itemVO.setJumpType(jumpType);
+        }
+    }
+    /**
      * 填充广告
      */
     private void fillAdvertising(List<ResourceColumnAndServeVO> serveVOS, Long bookId, Long adviserId, Long channelId, Integer enableAdverting) {

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

@@ -97,4 +97,8 @@ public class ResourcePageItemVO extends BaseDto{
 
     @ApiModelProperty("是否配置了公众号工具")
     private Boolean hasOfficialAccountsTool;
+
+    private String qrcodeType;
+
+    private Integer jumpType;
 }