feat:[none]合并代码报错

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletNewsPoolBizImpl.java

@@ -117,9 +117,9 @@ public class AppletNewsPoolBizImpl implements AppletNewsPoolBiz {
     }
 
     private void addResource(String source) {
-        Boolean exist = appletNewsDao.newsSourceExist(source);
+        Boolean exist = appletNewsDao.newsSourceExist(source,0L);
         if (!exist) {
-            appletNewsDao.insertSource(source);
+            appletNewsDao.insertSource(source,0L);
         }
         return;
     }

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletThirdResourcesBizImpl.java

@@ -171,9 +171,9 @@ public class AppletThirdResourcesBizImpl implements AppletThirdResourcesBiz {
     @Override
     public void updateThirdResources(AppletThirdResourcesDTO thirdResourcesDTO) {
         AppletThirdResources thirdResources = new AppletThirdResources();
-        Boolean exist = appletNewsDao.newsSourceExist(thirdResourcesDTO.getSource());
+        Boolean exist = appletNewsDao.newsSourceExist(thirdResourcesDTO.getSource(),0L);
         if (!exist) {
-            appletNewsDao.insertSource(thirdResourcesDTO.getSource());
+            appletNewsDao.insertSource(thirdResourcesDTO.getSource(),0L);
         }
 
         if (!StringUtil.isEmpty(thirdResourcesDTO.getNumber())) {
@@ -198,9 +198,9 @@ public class AppletThirdResourcesBizImpl implements AppletThirdResourcesBiz {
     public void createThirdResources(AppletThirdResourcesDTO thirdResourcesDTO) {
         AppletThirdResources thirdResources = new AppletThirdResources();
 
-        Boolean exist = appletNewsDao.newsSourceExist(thirdResourcesDTO.getSource());
+        Boolean exist = appletNewsDao.newsSourceExist(thirdResourcesDTO.getSource(),0L);
         if (!exist) {
-            appletNewsDao.insertSource(thirdResourcesDTO.getSource());
+            appletNewsDao.insertSource(thirdResourcesDTO.getSource(),0L);
         }
 
         if (!StringUtil.isEmpty(thirdResourcesDTO.getNumber())) {

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

@@ -947,7 +947,6 @@ public interface BookGroupBiz {
      *  * @param null
      */
     public Long getAccountSettingByAdviser(Long adviserId);
-    String getGroupNewsMaterialById(Long bookGroupQrcodeId, Long classifyId);
 
     /**
      * 出版社社群书数量

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

@@ -251,12 +251,11 @@ public interface GroupQrcodeBiz {
      * @param currentPage
      * @return
      */
-    PageBeanNew<AppletGroupManageDTO> getLocalGroup(Long wechatUserId, Integer numPerPage, Integer currentPage);
+    PageBeanNew<AppletGroupManageDTO> getLocalGroup(Long wechatUserId, Integer numPerPage, Integer currentPage, Long officialAccountsId);
 
     Integer updateGroupMaterial(List<String> groups);
 
     List<String> migrateMaterial(MaterialMigrateDTO migrateDTO);
 
     void syncGroupMaterial(Map<String, Long> accountMap);
-    PageBeanNew<AppletGroupManageDTO> getLocalGroup(Long wechatUserId, Integer numPerPage, Integer currentPage, Long officialAccountsId);
 }