feat:[1005260]小睿H5关注公众号弹窗

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

@@ -495,7 +495,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             }
             item.setServeId(officialAccountsId);
             item.setAccountSettingId(officialAccountsId);
-            item.setLinkUrl(null);
+            item.setLinkUrl(itemVO.getLinkUrl());
             item.setQrcodeShowType(itemVO.getQrcodeShowType());
             resourcePageItemDao.insert(item);
         }
@@ -697,9 +697,11 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 }
                 itemVOList.sort(Comparator.comparing(ResourcePageItemVO::getId));
                 Map<Long, List<ResourcePageItemVO>> columnMap = itemVOList.stream().collect(Collectors.groupingBy(ResourcePageItemVO::getResourcePageColumnId));
+                List<ResourceColumnAndServeVO> removeColumns = new ArrayList<>();
                 for (ResourceColumnAndServeVO columnAndServeVO : serveVOS) {
                     List<ResourcePageItemVO> itemVOS = columnMap.get(columnAndServeVO.getResourcePageColumnId());
                     if (ListUtils.isEmpty(itemVOS)) {
+                        removeColumns.add(columnAndServeVO);
                         continue;
                     }
                     columnAndServeVO.setItemVOList(itemVOS);
@@ -714,6 +716,9 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                         columnAndServeVO.setLogoUrl(itemVOS.get(0).getLogoUrl());
                     }
                 }
+                if (!ListUtils.isEmpty(removeColumns)) {
+                    serveVOS.removeAll(removeColumns);
+                }
             }
         }
         if(CollUtil.isEmpty(serveVOS)){
@@ -1243,11 +1248,24 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         Long resourcePageId = this.updateResourcePage(updateResourcePageVO);
         if (!ListUtils.isEmpty(updateResourcePageVO.getColumnVOS())) {
             List<UpdateResourceColumnVO> list = updateResourcePageVO.getColumnVOS();
+            List<ResourcePageItemVO> accountItemVOS = new ArrayList<>();
             for (UpdateResourceColumnVO columnVO : list) {
                 columnVO.setResourcePageId(resourcePageId);
                 columnVO.setCreateUser(updateResourcePageVO.getCreateUser());
                 //栏目校验
                 this.checkResourceColumn(columnVO);
+                //公众号栏目
+                if (ResourcePageConstants.ColumnTypeEnum.OFFICIAL_ACCOUNT.getCode().equals(columnVO.getColumnType())) {
+                    accountItemVOS.addAll(columnVO.getItemVOList());
+                }
+            }
+            //检查弹窗公众号配置数量
+            if (!ListUtils.isEmpty(accountItemVOS)) {
+                List<ResourcePageItemVO> popupItems = accountItemVOS.stream().filter(s->
+                        ResourcePageConstants.QrcodeShowTypeEnum.POPUP.getCode().equals(s.getQrcodeShowType())).collect(Collectors.toList());
+                if (popupItems.size()>1) {
+                    throw new BookBizException(BookBizException.PARAM_IS_NULL, "弹窗式公众号只能配置一个");
+                }
             }
             for (UpdateResourceColumnVO columnVO : list) {
                 this.updateResourceColumn(columnVO);
@@ -2123,8 +2141,10 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
 
     @Override
     public ResourcePageItemVO getPopupQrcode4Wechat(Long resourcePageId, Long wechatUserId) {
+        Boolean popupState = false;
         ResourcePageItemVO pageItemVO = resourcePageItemDao.getPopupQrcodeItem(resourcePageId);
         if (null == pageItemVO) {
+            pageItemVO.setPopupState(popupState);
             return new ResourcePageItemVO();
         }
         String logoUrl = pageItemVO.getLogoUrl();
@@ -2135,7 +2155,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         String qrcodeUrl = qrcodeSceneConsr.createTempQrcode4H5(accountSettingId, wechatUserId);
         if (!StringUtil.isEmpty(qrcodeUrl) && !StringUtil.isEmpty(logoUrl)) {
             //添加Logo
-            String url="";
+            String url = "";
             String tmpDirPath = FileUtil.getTmpDirPath();
             if (!tmpDirPath.endsWith(File.separator)) {
                 tmpDirPath = tmpDirPath + File.separator;
@@ -2150,6 +2170,11 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             qrcodeUrl = this.getLogoQrcode(url, logoUrl, qrcodeUrl);
         }
         pageItemVO.setResultUrl(qrcodeUrl);
+        if (!StringUtil.isEmpty(qrcodeUrl)) {
+            popupState = true;
+        }
+        pageItemVO.setPopupState(popupState);
+        pageItemVO.setLinkUrl(null);
         return pageItemVO;
     }
 

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

@@ -29,7 +29,8 @@ 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()}),
+        RAYS_TOOL(7,"RAYS工具",new String[]{ServeTypeEnum.APP.getValue()});
 
         private Integer code;
         private String name;

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

 package com.pcloud.book.group.vo;
 
-import com.pcloud.book.applet.dto.AppletNewsDTO;
 import com.pcloud.book.applet.dto.AppletOuterBooklistDTO;
 import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.book.applet.entity.AppletThirdResources;
-import com.pcloud.book.book.vo.BookLinkVO;
 import com.pcloud.book.book.vo.response.BookQrcodeWxworkResponseVO;
 import com.pcloud.common.dto.BaseDto;
-import com.pcloud.wechatgroup.wxwork.dto.WxworkGroupQrcodeBaseDTO;
-
-import java.math.BigDecimal;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -118,4 +112,8 @@ public class ResourcePageItemVO extends BaseDto{
      * 二维码公众号名称
      */
     private String accountSettingName;
+    /**
+     * 二维码公众号弹出状态
+     */
+    private Boolean popupState;
 }