Merge branch 'feature/guanpei' into 'master'

feat: [none] 馆配

See merge request rays/pcloud-book!1319

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

@@ -92,6 +92,7 @@
         p.scene_id
         FROM
         resource_page p
+        LEFT JOIN resource_page_item i ON p.id = i.resource_page_id
         WHERE
         p.book_id = #{bookId}
         <if test="channelId != null">
@@ -100,9 +101,12 @@
         <if test="adviserId != null">
             AND p.create_user = #{adviserId}
         </if>
+        GROUP BY
+        p.id
         ORDER BY
         p.open_rays DESC,
-        p.create_time DESC
+        COUNT(i.id) DESC,
+        p.update_time DESC
         LIMIT 1
     </select>