Merge branch 'feature/1004889-01' into 'master'

feat: [1004889] 小蓝书-关注公众号加付费

See merge request rays/pcloud-book!1340

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

@@ -872,6 +872,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 accountSettingMap.put(accountSettingId, accountSetting);
             }
             BeanUtils.copyProperties(accountSetting, accountSettingDto);
+            itemVO.setHasOfficialAccountsTool(true);
 
         } else {
             Long channelId = itemVO.getChannelId();
@@ -880,6 +881,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 accountSettingDto = qrcodeSceneConsr.getWechatInfo(channelId);
                 channelAccountSettingDtoMap.put(channelId, accountSettingDto);
             }
+            itemVO.setHasOfficialAccountsTool(false);
         }
         if (null == accountSettingDto) {
             throw new BookBizException(BookBizException.ERROR, itemVO.getServeName() + "未设置公众号");
@@ -1349,6 +1351,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 pageOneServe.setHasThirdLink(itemVO.getHasThirdLink());
                 pageOneServe.setServeName(itemVO.getServeName());
                 pageOneServe.setPrice(itemVO.getPrice());
+                pageOneServe.setHasOfficialAccountsTool(itemVO.getHasOfficialAccountsTool());
             }
         }
         return pageOneServe;

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

@@ -94,4 +94,7 @@ public class ResourcePageItemVO extends BaseDto{
 
 
     private Long sceneId;
+
+    @ApiModelProperty("是否配置了公众号工具")
+    private Boolean hasOfficialAccountsTool;
 }

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

@@ -3,6 +3,7 @@ package com.pcloud.book.group.vo;
 import com.pcloud.common.dto.BaseDto;
 
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -53,4 +54,7 @@ public class ResourcePageOneServe extends BaseDto {
     private Integer jumpType;
 
     private String qrcodeType;
+
+    @ApiModelProperty("是否配置了公众号工具")
+    private Boolean hasOfficialAccountsTool;
 }