Merge branch 'feature/1006102' into 'master'

feat:[1006102]上邮二维码配置权限

See merge request rays/pcloud-book!1461

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

@@ -280,7 +280,16 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         }
         //上邮临时处理方案
         if (null != bySceneId && null != bySceneId.getBookId() && null != JedisClusterUtils.hget(nftReleaseLockKey, bySceneId.getBookId().toString())) {
-           throw new BizException(BizException.PARAM_IS_NULL.getCode(), "此二维码需统一配置资源, 请勿单独配置");
+            NftBookState nftBookState = JedisClusterUtils.hgetJson2Class(nftReleaseLockKey, bySceneId.getBookId().toString(), NftBookState.class);
+            if (null != updateResourcePageVO.getBookGroupId()) {
+                if (null != nftBookState.getNftBookGroupId() && !nftBookState.getNftBookGroupId().equals(updateResourcePageVO.getBookGroupId())) {
+                    throw new BizException(BizException.PARAM_IS_NULL.getCode(), "此二维码需统一配置资源, 请勿单独配置");
+                }
+            } else if (null != updateResourcePageVO.getSceneId()) {
+                if (null != nftBookState.getNftSceneId() && !nftBookState.getNftSceneId().equals(updateResourcePageVO.getSceneId())) {
+                    throw new BizException(BizException.PARAM_IS_NULL.getCode(), "此二维码需统一配置资源, 请勿单独配置");
+                }
+            }
         }
         if (null != updateResourcePageVO.getBookGroupId()) {
            return this.updatePageByBookGroupId(updateResourcePageVO);