修改高级会员封存解封

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -267,18 +267,26 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         List<ScenePro> list = this.list(wrapper);
         List<ScenePlus> plusList = scenePlusService.list(plusWr);
 
-        Long beyondSpace = cameraDetail.getUsedSpace() - totalSpace;
-        if(totalSpace == -1){
-            beyondSpace = Long.MAX_VALUE;
+        List<Long> lockedIds = new ArrayList<>();
+
+        if(totalSpace == -1 && payStatus == 1){
+            List<Long> collect = list.stream().map(ScenePro::getId).collect(Collectors.toList());
+            List<Long> collect2 = plusList.stream().map(ScenePlus::getId).collect(Collectors.toList());
+            lockedIds.addAll(collect);
+            lockedIds.addAll(collect2);
+            lockOrUnLockScenes(lockedIds,payStatus);  //  无限容量 全部解封
+            return;
         }
 
+        Long beyondSpace =  0L;
         Long accumulateSpace = 0L;
-        List<Long> lockedIds = new ArrayList<>();
         if(payStatus == 1){
+            beyondSpace =  totalSpace - cameraDetail.getTotalSpace();
             Long doSpace = getScenePlusLockedIds(lockedIds, plusList, beyondSpace, accumulateSpace);
             beyondSpace -= doSpace;
             getSceneLockedIds(lockedIds,list,beyondSpace,accumulateSpace);
         }else {
+            beyondSpace =  Math.abs(cameraDetail.getUsedSpace() - totalSpace);
             Long doSpace = getSceneLockedIds(lockedIds, list, beyondSpace, accumulateSpace);
             beyondSpace -= doSpace;
             getScenePlusLockedIds(lockedIds,plusList,beyondSpace,accumulateSpace);