Merge branch 'feature/appCustomerService' into 'master'

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

See merge request rays/pcloud-book!961

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java

@@ -1466,6 +1466,11 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                         } else {
                             item.setResultUrl(item.getLinkUrl());
                         }
+                        if (!StringUtil.isEmpty(productDto.getSkipUrl())){
+                            item.setHasThirdLink(true);
+                        } else {
+                            item.setHasThirdLink(false);
+                        }
                     }
                 }
                 if (AppAndProductTypeEnum.APP.value.equals(item.getServeType())) {
@@ -1481,6 +1486,11 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                         accountSettingDto = qrcodeSceneConsr.getWechatInfo(appDto.getChannelId());
                         String resultLinkUrl = SendWeixinRequestTools.splitUrl(accountSettingDto, item.getLinkUrl());
                         item.setResultUrl(resultLinkUrl);
+                        if (!StringUtil.isEmpty(appDto.getTurnUrl())){
+                            item.setHasThirdLink(true);
+                        } else {
+                            item.setHasThirdLink(false);
+                        }
                     } else {
                         list_remove.add(item); //把要移除的统一放在一个集合
                     }

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/constants/RightsSettingConstant.java

@@ -36,7 +36,7 @@ public class RightsSettingConstant {
      */
     public static final String[] APPLET_PRODUCT_NOT_SUPPORT = {ProductTypeConstant.QA,ProductTypeConstant.TOOL,
             ProductTypeConstant.TUTORIAL,ProductTypeConstant.ATTENDANCE_TASK, ProductTypeConstant.MEMBER,
-            ProductTypeConstant.THIRDPARTY,ProductTypeConstant.LINK};
+            ProductTypeConstant.THIRDPARTY};
 
     public static final Integer MAX_ITEM_COUNT = 3;
 }

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/entity/RightsNowItem.java

@@ -113,4 +113,6 @@ public class RightsNowItem extends BaseEntity {
     private String showUrl;
     @ApiModelProperty("是否收藏")
     private Integer isCollect;
+    @ApiModelProperty("商品应用中有第三方链接")
+    private Boolean hasThirdLink;
 }