Merge branch 'fixbug/linkUrl' into 'master'

feat: [none] rays码bug

See merge request rays/pcloud-book!1294

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

@@ -66,13 +66,6 @@ public interface ResourcePageBiz {
     ResourcePageVO getResourcePageByBookId(Long bookId, Long channelId, Long adviserId, Long wechatUserId);
 
     /**
-     * 处理旧数据
-     * @author：zhuyajie
-     * @date：2021/3/31 11:38
-     *  * @param null
-     */
-    void dealResource(List<Long> bookGroupIdList, List<Long> sceneIdList);
-    /**
      * 栏目分页查询
      * @author：zhuyajie
      * @date：2021/3/31 19:06

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

@@ -87,4 +87,12 @@ public interface ResourcePageDao extends BaseDao<ResourcePage>{
      *  * @param null
      */
     void batchUpdateSceneIdByBookGroup(List<AddBookGroupServeDTO> list);
+
+    /**
+     * 查栏目对应的资源页
+     * @author：zhuyajie
+     * @date：2021/5/6 17:41
+     *  * @param null
+     */
+    ResourcePage getPageByColumnId(Long resourcePageColumnId);
 }
\ No newline at end of file

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

@@ -68,4 +68,9 @@ public class ResourcePageDaoImpl extends BaseDaoImpl<ResourcePage> implements Re
     public void batchUpdateSceneIdByBookGroup(List<AddBookGroupServeDTO> list) {
         getSessionTemplate().update(getStatement("batchUpdateSceneIdByBookGroup"), list);
     }
+
+    @Override
+    public ResourcePage getPageByColumnId(Long resourcePageColumnId) {
+        return getSessionTemplate().selectOne(getStatement("getPageByColumnId"), resourcePageColumnId);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/ResourcePageFacade.java

@@ -125,17 +125,6 @@ public class ResourcePageFacade {
         return new ResponseDto<>();
     }
 
-    @ApiOperation("处理旧数据")
-    @PostMapping("dealResource")
-    public ResponseDto<?> dealResource(@RequestBody List<Long> qrcodeIdList, @RequestParam("qrcodeType") String qrcodeType){
-        if ("bookgroup".equals(qrcodeType)) {
-            resourcePageBiz.dealResource(qrcodeIdList, null);
-        } else {
-            resourcePageBiz.dealResource(null, qrcodeIdList);
-        }
-        return new ResponseDto<>();
-    }
-
     @ApiOperation("更新资源页和栏目设置")
     @PostMapping("updateResourcePageAndColumn")
     public ResponseDto<?> updateResourcePageAndColumn(@RequestHeader("token") String token,

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

@@ -51,4 +51,6 @@ public class ResourcePageOneServe extends BaseDto {
     private Double price;
 
     private Integer jumpType;
+
+    private String qrcodeType;
 }

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

@@ -167,4 +167,21 @@
         </foreach>
     </update>
 
+    <select id="getPageByColumnId" resultMap="ResourcePageMap" parameterType="long">
+    SELECT
+        p.id,
+        p.book_group_id,
+        p.style,
+        p.show_book,
+        p.open_rays,
+        p.qrcode_url,
+        p.scene_id,
+        p.official_scene_id
+    FROM
+        resource_page_column c
+    LEFT JOIN resource_page p ON c.resource_page_id = p.id
+    WHERE
+        c.id = #{resourcePageColumnId}
+    </select>
+
 </mapper>
\ No newline at end of file