Merge branch 'feature/1006019' into 'master'

feat:[1006019]H5图片位支持无跳转

See merge request rays/pcloud-book!1455

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

@@ -2249,7 +2249,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 courseDTO.setDepLabelName(appDto.getDepLabelName());
                 courseDTO.setPurLabelName(appDto.getPurLabelName());
                 //跳转链接
-                String turnUrl = ServeLinkUtils.getCompleteLink("APP", appDto.getTypeCode(),  appDto.getAppId().toString(),
+                String turnUrl = ServeLinkUtils.getCompleteLink(ResourcePageConstants.ServeTypeEnum.APP.getValue(), appDto.getTypeCode(),  appDto.getAppId().toString(),
                         appDto.getSceneCode(), appDto.getChannelId().toString(), appDto.getCreatedUser().toString(), null, accountSettingId.toString(),
                         accountSetting.getProtocol(), accountSetting.getDomain(), accountSetting.getFirstDomain(),
                         null != accountSetting.getRandom() ? accountSetting.getRandom().toString() : null);
@@ -2270,7 +2270,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                     courseDTO.setPurLabelName(labelDtos.get(0).getPurLabelName());
                 }
                 //跳转链接
-                String turnUrl = ServeLinkUtils.getCompleteLink("PRODUCT", courseDTO.getTypeCode(), productDto.getProductId().toString(),
+                String turnUrl = ServeLinkUtils.getCompleteLink(ResourcePageConstants.ServeTypeEnum.PRODUCT.getValue(), courseDTO.getTypeCode(), productDto.getProductId().toString(),
                         productDto.getProductSceneCode(), courseDTO.getChannelId().toString(), null, null, accountSettingId.toString(),
                         accountSetting.getProtocol(), accountSetting.getDomain(), accountSetting.getFirstDomain(),
                         null != accountSetting.getRandom() ? accountSetting.getRandom().toString() : null);

pcloud-service-book/src/main/java/com/pcloud/book/group/constant/ResourcePageConstants.java

@@ -29,7 +29,7 @@ public class ResourcePageConstants {
         GROUP(4, "社群", new String[]{ServeTypeEnum.GROUP_ACTIVITY.getValue(), ServeTypeEnum.WXWORK_GROUP.getValue()}),
         THIRD_RESOURCE(5, "第三方资源", new String[]{ServeTypeEnum.THIRD_RESOURCE.getValue()}),
         PICTURE(6, "图片位", new String[]{ServeTypeEnum.APP.getValue(), ServeTypeEnum.PRODUCT.getValue(),
-                ServeTypeEnum.GROUP_ACTIVITY.getValue(), ServeTypeEnum.THIRD_RESOURCE.getValue()}),
+                ServeTypeEnum.GROUP_ACTIVITY.getValue(), ServeTypeEnum.THIRD_RESOURCE.getValue(), ServeTypeEnum.NO_SERVE.value}),
         RAYS_TOOL(7,"RAYS工具",new String[]{ServeTypeEnum.APP.getValue()}),
         MEMBER_ACTIVITY(8,"平台会员活动", new String[]{ServeTypeEnum.MEMBER_ACTIVITY.getValue()});
 
@@ -84,7 +84,8 @@ public class ResourcePageConstants {
         GROUP_ACTIVITY("GROUP_ACTIVITY", "模板群"),
         THIRD_RESOURCE("THIRD_RESOURCE", "第三方资源"),
         WXWORK_GROUP("WXWORK_GROUP","企业微信群"),
-        MEMBER_ACTIVITY("MEMBER_ACTIVITY","平台会员活动");
+        MEMBER_ACTIVITY("MEMBER_ACTIVITY","平台会员活动"),
+        NO_SERVE("NO_SERVE","无服务");
 
         private String value;