feat:[1005439]策划/商务：平台会员

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

@@ -1894,24 +1894,40 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         ownMessageDTO.setChannelId(qrcodeSceneDto.getChannelPartyId());
         ownMessageDTO.setSceneId(sceneId);
         //配置的资源
-        Map<Long, List<BookGroupServeDTO>> serveList = this.mapSceneServeList(Arrays.asList(sceneId));
+        List<Message> messages = this.getServeListBySceneId4QrUpdate(sceneId);
+        ownMessageDTO.setMessages(messages);
+        qrcodeSceneConsr.updateOwnMessage4Qr(ownMessageDTO);
+    }
+
+    /**
+     * 需要同步到channel的资源
+     * @author：zhuyajie
+     * @date：2021/9/28 10:12
+     *  * @param null
+     */
+    private List<Message> getServeListBySceneId4QrUpdate(Long sceneId) {
+        List<ResourcePageItemVO> itemVOS = resourcePageItemDao.getServeListBySceneId4QrUpdate(sceneId);
+        if (ListUtils.isEmpty(itemVOS)) {
+            return new ArrayList<>();
+        }
+        Map<String, List<ResourcePageItemVO>> listMap = itemVOS.stream().collect(Collectors.groupingBy(ResourcePageItemVO::getServeType));
+        for (Map.Entry<String, List<ResourcePageItemVO>> entry : listMap.entrySet()) {
+            this.fillResourceByType(entry.getValue(), null, entry.getKey());
+        }
         List<Message> messages = new ArrayList<>();
-        if (!MapUtils.isEmpty(serveList)) {
-            for (BookGroupServeDTO serveDTO : serveList.get(sceneId)) {
+        for (ResourcePageItemVO itemVO: itemVOS) {
             Message message = new Message();
-                message.setFromId(serveDTO.getServeId());
-                message.setFromType(serveDTO.getTypeCode());
-                message.setUrl(serveDTO.getServeUrl());
-                message.setCoverImg(serveDTO.getPicUrl());
-                message.setPosterPicUrl(serveDTO.getTransverseImg());
-                message.setTitle(serveDTO.getServeName());
-                message.setShortTitle(serveDTO.getTypeName());
-                message.setTypeCode(serveDTO.getServeType());
+            message.setFromId(itemVO.getServeId());
+            message.setFromType(itemVO.getTypeCode());
+            message.setUrl(itemVO.getLinkUrl());
+            message.setCoverImg(itemVO.getServePic());
+            message.setPosterPicUrl(itemVO.getTransverseImg());
+            message.setTitle(itemVO.getServeName());
+            message.setShortTitle(itemVO.getTypeName());
+            message.setTypeCode(itemVO.getServeType());
             messages.add(message);
         }
-        }
-        ownMessageDTO.setMessages(messages);
-        qrcodeSceneConsr.updateOwnMessage4Qr(ownMessageDTO);
+        return messages;
     }
 
     @Override

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/ResourcePageItemDao.java

@@ -138,4 +138,12 @@ public interface ResourcePageItemDao extends BaseDao<ResourcePageItem>{
      *  * @param null
      */
     List<String> getConfiguredRaysAppTypeCode(Long resourcePageColumnId);
+
+    /**
+     * 需要同步到channel的资源列表
+     * @author：zhuyajie
+     * @date：2021/9/28 10:19
+     *  * @param null
+     */
+    List<ResourcePageItemVO> getServeListBySceneId4QrUpdate(Long sceneId);
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/ResourcePageItemDaoImpl.java

@@ -132,4 +132,9 @@ public class ResourcePageItemDaoImpl extends BaseDaoImpl<ResourcePageItem> imple
     public List<String> getConfiguredRaysAppTypeCode(Long resourcePageColumnId) {
         return getSessionTemplate().selectList(getStatement("getConfiguredRaysAppTypeCode"), resourcePageColumnId);
     }
+
+    @Override
+    public List<ResourcePageItemVO> getServeListBySceneId4QrUpdate(Long sceneId) {
+        return getSessionTemplate().selectList(getStatement("getServeListBySceneId4QrUpdate"), sceneId);
+    }
 }

pcloud-service-book/src/main/resources/mapper/group/ResourcePageItemDao.xml

@@ -364,4 +364,26 @@
         WHERE
             resource_page_column_id = #{resourcePageColumnId}
     </select>
+
+    <select id="getServeListBySceneId4QrUpdate" parameterType="long" resultType="com.pcloud.book.group.vo.ResourcePageItemVO">
+        SELECT
+        i.serve_id serveId,
+        i.serve_type serveType,
+        i.link_url linkUrl,
+        p.create_user createUser,
+        i.type_code typeCode,
+        p.scene_id sceneId
+        FROM
+        resource_page_item i
+        LEFT JOIN resource_page p ON i.resource_page_id = p.id
+        LEFT JOIN resource_page_column c ON i.resource_page_column_id = c.id
+        LEFT JOIN resource_page_navigation n ON c.navigation_id = n.id
+        WHERE
+        p.scene_id = #{sceneId}
+        AND i.serve_type IN ('APP', 'PRODUCT','MEMBER_ACTIVITY')
+        GROUP BY i.serve_id
+        ORDER BY
+        n.navigation_seq ASC, c.column_seq ASC, i.seq_num ASC, i.id ASC
+    </select>
+
 </mapper>
\ No newline at end of file