Merge branch 'feature/1004667' into 'master'

feat:[1004667] 落地页授权到业务公众号

See merge request rays/pcloud-book!1281

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

@@ -1229,11 +1229,8 @@ public class BookGroupBizImpl implements BookGroupBiz {
         if (bookGroupDTO != null) {
             result.put("joinGroupType", bookGroupDTO.getJoinGroupType());
             if (JoinGroupTypeEnum.XIAORUI.getCode().equals(bookGroupDTO.getJoinGroupType())) {
-                BookAppletScene applet = bookAppletSceneDao.getByBookGroupId(bookGroupId);
-                if (null != applet) {
-                    result.put("classifyId", applet.getRaysClassifyId());
-                }
                 result.put("jumpType", bookGroupDTO.getJumpType());
+                result.put("jumpUrl", bookGroupDTO.getJumpUrl());
             }
         }
         if (null != bookGroupDTO && null != bookGroupDTO.getBookId()) {

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

@@ -480,6 +480,8 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 resourcePageVO.setAdviserId(dto.getCreateUser());
                 resourcePageVO.setChannelId(dto.getChannelId());
             }
+            //预览取原有二维码
+            resourcePageVO.setQrcodeUrl(dto.getGroupQrcodeUrl());
         } else {
             ResourcePage resourcePage = resourcePageDao.getBySceneId(sceneId);
             if (null == resourcePage) {
@@ -492,6 +494,8 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setBookId(qrcodeSceneDto.getAdviserBookId());
             resourcePageVO.setAdviserId(qrcodeSceneDto.getCreatedByUserLogin());
             resourcePageVO.setChannelId(qrcodeSceneDto.getChannelPartyId());
+            //预览取原有二维码
+            resourcePageVO.setQrcodeUrl(qrcodeSceneDto.getQrcodeUrl());
         }
         Map<Long, AdviserBaseInfoDto> agentMap = adviserConsr.getAdviserId2AdviserInfoDtoMap(Arrays.asList(adviserId));
         if (!MapUtils.isEmpty(agentMap)) {

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

@@ -66,6 +66,7 @@
           id, book_group_id, style, show_book, open_rays, qrcode_url, official_scene_id
         from book.resource_page
         where book_group_id = #{bookGroupId}
+        limit 1
     </select>
 
     <select id="getByBookId" parameterType="map" resultMap="ResourcePageMap">
@@ -121,6 +122,7 @@
         id, book_group_id, style, show_book, open_rays, qrcode_url, scene_id, official_scene_id
         from book.resource_page
         where scene_id = #{sceneId}
+        limit 1
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -118,7 +118,7 @@
         ORDER BY seq_num asc, id asc
     </select>
 
-    <select id="getResourceCounts" parameterType="long">
+    <select id="getResourceCounts" parameterType="long" resultType="integer">
         SELECT  COUNT(1)
         FROM
             resource_page_item