Commit 7e61e695 by zhuyajie

feat:[1003491]应用作品第三方链接进客服

parent 675f8929
...@@ -1466,6 +1466,11 @@ public class RightsSettingBizImpl implements RightsSettingBiz { ...@@ -1466,6 +1466,11 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
} else { } else {
item.setResultUrl(item.getLinkUrl()); item.setResultUrl(item.getLinkUrl());
} }
if (!StringUtil.isEmpty(productDto.getSkipUrl())){
item.setHasThirdLink(true);
} else {
item.setHasThirdLink(false);
}
} }
} }
if (AppAndProductTypeEnum.APP.value.equals(item.getServeType())) { if (AppAndProductTypeEnum.APP.value.equals(item.getServeType())) {
...@@ -1481,6 +1486,11 @@ public class RightsSettingBizImpl implements RightsSettingBiz { ...@@ -1481,6 +1486,11 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
accountSettingDto = qrcodeSceneConsr.getWechatInfo(appDto.getChannelId()); accountSettingDto = qrcodeSceneConsr.getWechatInfo(appDto.getChannelId());
String resultLinkUrl = SendWeixinRequestTools.splitUrl(accountSettingDto, item.getLinkUrl()); String resultLinkUrl = SendWeixinRequestTools.splitUrl(accountSettingDto, item.getLinkUrl());
item.setResultUrl(resultLinkUrl); item.setResultUrl(resultLinkUrl);
if (!StringUtil.isEmpty(appDto.getTurnUrl())){
item.setHasThirdLink(true);
} else {
item.setHasThirdLink(false);
}
} else { } else {
list_remove.add(item); //把要移除的统一放在一个集合 list_remove.add(item); //把要移除的统一放在一个集合
} }
......
...@@ -36,7 +36,7 @@ public class RightsSettingConstant { ...@@ -36,7 +36,7 @@ public class RightsSettingConstant {
*/ */
public static final String[] APPLET_PRODUCT_NOT_SUPPORT = {ProductTypeConstant.QA,ProductTypeConstant.TOOL, public static final String[] APPLET_PRODUCT_NOT_SUPPORT = {ProductTypeConstant.QA,ProductTypeConstant.TOOL,
ProductTypeConstant.TUTORIAL,ProductTypeConstant.ATTENDANCE_TASK, ProductTypeConstant.MEMBER, ProductTypeConstant.TUTORIAL,ProductTypeConstant.ATTENDANCE_TASK, ProductTypeConstant.MEMBER,
ProductTypeConstant.THIRDPARTY,ProductTypeConstant.LINK}; ProductTypeConstant.THIRDPARTY};
public static final Integer MAX_ITEM_COUNT = 3; public static final Integer MAX_ITEM_COUNT = 3;
} }
...@@ -113,4 +113,6 @@ public class RightsNowItem extends BaseEntity { ...@@ -113,4 +113,6 @@ public class RightsNowItem extends BaseEntity {
private String showUrl; private String showUrl;
@ApiModelProperty("是否收藏") @ApiModelProperty("是否收藏")
private Integer isCollect; private Integer isCollect;
@ApiModelProperty("商品应用中有第三方链接")
private Boolean hasThirdLink;
} }
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