Merge branch 'feature/booksop' into 'master'

feat:[1006950]图书sop

See merge request rays/pcloud-book!1546

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

@@ -21,5 +21,7 @@ public interface ResourcePageModelDao extends BaseDao<ResourcePageModel> {
     void deleteByPageId(Long resourcePageId);
 
     void deleteByPageIdAndTypeCode(Long resourcePageId, List<String> typeCodes);
+
+    void deleteByPageIdExcludeTypeCode(Long resourcePageId, List<String> typeCodes);
 }
 

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

@@ -35,4 +35,12 @@ public class ResourcePageModelDaoImpl extends BaseDaoImpl<ResourcePageModel> imp
         map.put("typeCodes", typeCodes);
         getSessionTemplate().delete(getStatement("deleteByPageIdAndTypeCode"), map);
     }
+
+    @Override
+    public void deleteByPageIdExcludeTypeCode(Long resourcePageId, List<String> typeCodes) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("resourcePageId", resourcePageId);
+        map.put("typeCodes", typeCodes);
+        getSessionTemplate().delete(getStatement("deleteByPageIdExcludeTypeCode"), map);
+    }
 }

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

@@ -135,7 +135,8 @@
         p.font_color,
         p.transparency,
         p.navigation_jump_type,
-        p.is_show_price
+        p.is_show_price,
+        p.landing_page_type
         FROM
         resource_page p
         LEFT JOIN resource_page_item i ON p.id = i.resource_page_id

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

@@ -100,5 +100,14 @@
         </foreach>
     </delete>
 
+    <delete id="deleteByPageIdExcludeTypeCode" parameterType="map">
+        delete from resource_page_model
+        where resource_page_id = #{resourcePageId}
+        and type_code not in
+        <foreach collection="typeCodes" separator="," item="item" index="index" open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
+
 </mapper>