feat: [1006013] 书友互助

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

@@ -123,6 +123,7 @@ import com.pcloud.common.utils.UUIDUitl;
 import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.message.common.enums.YesNoEnums;
+import com.pcloud.readercenter.common.enums.YesOrNoNumEnum;
 import com.pcloud.readercenter.userlabel.dto.UserGradeLabelIdDTO;
 import com.pcloud.resourcecenter.product.dto.ProductDto;
 import com.pcloud.resourcecenter.product.dto.ProductLabelDto;
@@ -303,6 +304,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         ResourcePage resourcePage = resourcePageDao.getBySceneId(sceneId);
         updateResourcePageVO.setOpenRays(updateResourcePageVO.getOpenRays() == null ? 0 : updateResourcePageVO.getOpenRays());
         QrcodeSceneDto qrcodeSceneDto = qrcodeSceneConsr.getById(sceneId);
+        Integer openRays = null != resourcePage ? resourcePage.getOpenRays() : null;
         if (null == resourcePage) {
             resourcePage = new ResourcePage();
             BeanUtils.copyProperties(updateResourcePageVO, resourcePage);
@@ -348,8 +350,10 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             }
             //同一本书其他码下关闭小睿流程
             resourcePageDao.setOtherPageRaysClose(resourcePage.getBookId(), resourcePage.getChannelId(), resourcePage.getCreateUser(), sceneId, null);
-            //添加小程序默认导航
+            //添加小程序默认导航 之前关闭才添加
+            if (!YesOrNoNumEnum.YES.getValue().equals(openRays)) {
                 this.addDefaultAppletNavigation(resourcePage.getId());
+            }
         } else {
             //删除小程序默认导航
             this.deleteAppletDefaultNavigation(resourcePage.getId());
@@ -380,6 +384,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         ResourcePage resourcePage = resourcePageDao.getByBookGroupId(bookGroupId);
         updateResourcePageVO.setOpenRays(updateResourcePageVO.getOpenRays() == null ? 0 : updateResourcePageVO.getOpenRays());
         BookGroupDTO dto = bookGroupDao.getDTOById(bookGroupId);
+        Integer openRays = null != resourcePage ? resourcePage.getOpenRays() : null;
         if (null == resourcePage) {
             resourcePage = new ResourcePage();
             BeanUtils.copyProperties(updateResourcePageVO, resourcePage);
@@ -416,8 +421,10 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             }
             //同一本书其他码下关闭小睿流程
             resourcePageDao.setOtherPageRaysClose(resourcePage.getBookId(), resourcePage.getChannelId(), resourcePage.getCreateUser(), null, bookGroupId);
-            //添加小程序默认导航
+            //添加小程序默认导航 之前关闭才添加
+            if (!YesOrNoNumEnum.YES.getValue().equals(openRays)) {
                 this.addDefaultAppletNavigation(resourcePage.getId());
+            }
         } else {
             //删除小程序默认导航
             this.deleteAppletDefaultNavigation(resourcePage.getId());
@@ -2619,7 +2626,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         if (null == resourcePageNavigation) {
             return;
         }
-        List<Integer> types = Arrays.asList(ResourcePageConstants.NavigationTypeEnum.BOOK_SERVE.getCode(),ResourcePageConstants.NavigationTypeEnum.APPLET_QA.getCode());
+        List<Integer> types = Arrays.asList(ResourcePageConstants.NavigationTypeEnum.BOOK_SERVE.getCode());
         if (types.contains(resourcePageNavigation.getNavigationType())) {
             throw new BookBizException(BookBizException.PARAM_IS_NULL,"该导航不能删除");
         }