feat: [1003730] 应用作品收藏功能

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletRecordBizImpl.java

@@ -20,6 +20,7 @@ import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.consumer.app.AppConsr;
 import com.pcloud.book.consumer.channel.QrcodeSceneConsr;
 import com.pcloud.book.consumer.resource.ProductConsr;
+import com.pcloud.book.group.enums.AppAndProductTypeEnum;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
 import com.pcloud.book.rightsSetting.biz.RightsSettingBiz;
 import com.pcloud.book.skill.biz.PcloudGroupActivityBiz;
@@ -390,6 +391,13 @@ public class AppletRecordBizImpl implements AppletRecordBiz {
         }
         String resultLinkUrl = SendWeixinRequestTools.splitUrl(accountSettingDto, appletRecordDTO.getLinkUrl());
         appletAppOrProductDTO.setResultUrl(resultLinkUrl);
+        if (!StringUtil.isEmpty(appDto.getTurnUrl())){
+            appletAppOrProductDTO.setHasThirdLink(true);
+        } else {
+            appletAppOrProductDTO.setHasThirdLink(false);
+        }
+        appletAppOrProductDTO.setServeType(AppAndProductTypeEnum.APP.value);
+        appletAppOrProductDTO.setServeId(appletRecordDTO.getFromId());
         appletRecordDTO.setAppletAppOrProductDTO(appletAppOrProductDTO);
     }
 
@@ -435,6 +443,13 @@ public class AppletRecordBizImpl implements AppletRecordBiz {
         } else {
             appletAppOrProductDTO.setResultUrl(appletRecordDTO.getLinkUrl());
         }
+        if (!StringUtil.isEmpty(productDto.getSkipUrl())){
+            appletAppOrProductDTO.setHasThirdLink(true);
+        } else {
+            appletAppOrProductDTO.setHasThirdLink(false);
+        }
+        appletAppOrProductDTO.setServeType(AppAndProductTypeEnum.PRODUCT.value);
+        appletAppOrProductDTO.setServeId(appletRecordDTO.getFromId());
         appletRecordDTO.setAppletAppOrProductDTO(appletAppOrProductDTO);
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/ServeCollectBizImpl.java

@@ -2,6 +2,7 @@ package com.pcloud.book.applet.biz.impl;
 
 import cn.hutool.core.map.MapUtil;
 import com.pcloud.appcenter.app.dto.AppDto;
+import com.pcloud.appcenter.app.entity.AppType;
 import com.pcloud.book.applet.biz.AppletNewsBiz;
 import com.pcloud.book.applet.biz.ServeCollectBiz;
 import com.pcloud.book.applet.dao.ServeCollectDao;
@@ -15,12 +16,14 @@ import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.consumer.app.AppConsr;
 import com.pcloud.book.consumer.channel.QrcodeSceneConsr;
 import com.pcloud.book.consumer.resource.ProductConsr;
+import com.pcloud.book.group.enums.AppAndProductTypeEnum;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
 import com.pcloud.book.skill.entity.PcloudResourceItem;
 import com.pcloud.book.util.common.ThreadPoolUtils;
 import com.pcloud.book.util.common.YesOrNoEnums;
 import com.pcloud.channelcenter.wechat.dto.AccountSettingDto;
 import com.pcloud.common.core.aspect.ParamLog;
+import com.pcloud.common.enums.AppTypeEnum;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
@@ -188,6 +191,13 @@ public class ServeCollectBizImpl implements ServeCollectBiz {
         }
         String resultLinkUrl = SendWeixinRequestTools.splitUrl(accountSettingDto, serveCollect.getLinkUrl());
         appletAppOrProductDTO.setResultUrl(resultLinkUrl);
+        if (!StringUtil.isEmpty(appDto.getTurnUrl())){
+            appletAppOrProductDTO.setHasThirdLink(true);
+        } else {
+            appletAppOrProductDTO.setHasThirdLink(false);
+        }
+        appletAppOrProductDTO.setServeType(AppAndProductTypeEnum.APP.value);
+        appletAppOrProductDTO.setServeId(serveCollect.getServeId());
         serveCollect.setAppletAppOrProductDTO(appletAppOrProductDTO);
     }
 
@@ -233,6 +243,13 @@ public class ServeCollectBizImpl implements ServeCollectBiz {
         } else {
             appletAppOrProductDTO.setResultUrl(serveCollect.getLinkUrl());
         }
+        if (!StringUtil.isEmpty(productDto.getSkipUrl())){
+            appletAppOrProductDTO.setHasThirdLink(true);
+        } else {
+            appletAppOrProductDTO.setHasThirdLink(false);
+        }
+        appletAppOrProductDTO.setServeType(AppAndProductTypeEnum.PRODUCT.value);
+        appletAppOrProductDTO.setServeId(serveCollect.getServeId());
         serveCollect.setAppletAppOrProductDTO(appletAppOrProductDTO);
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/applet/dto/AppletAppOrProductDTO.java

@@ -16,4 +16,10 @@ public class AppletAppOrProductDTO {
     private String serveTypeCode;
     @ApiModelProperty("结果链接")
     private String resultUrl;
+    @ApiModelProperty("商品应用中有第三方链接")
+    private Boolean hasThirdLink;
+    @ApiModelProperty("商品应用类型")
+    private String serveType;
+    @ApiModelProperty("商品应用id")
+    private Long serveId;
 }