Revert "封存逻辑修复"

This reverts commit 1084e769

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

@@ -203,17 +203,18 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         Long beyondSpace = Math.abs(cameraDetail.getUsedSpace() - cameraDetail.getTotalSpace());
         Long accumulateSpace = 0L;
-        List<Long> proLockedIds = new ArrayList<>();
-        List<Long> plusLockedIds = new ArrayList<>();
+        List<Long> lockedIds = new ArrayList<>();
         if(payStatus == 1){
-            accumulateSpace = getSceneLockedIds(proLockedIds,list,count,beyondSpace,accumulateSpace);
-            getScenePlusLockedIds(plusLockedIds,plusList,count,beyondSpace,accumulateSpace);
+            Long doSpace = getScenePlusLockedIds(lockedIds, plusList, count, beyondSpace, accumulateSpace);
+            beyondSpace -= doSpace;
+            getSceneLockedIds(lockedIds,list,count,beyondSpace,accumulateSpace);
         }else {
-            accumulateSpace = getSceneLockedIds(proLockedIds,list,count,beyondSpace,accumulateSpace);
-            getScenePlusLockedIds(plusLockedIds,plusList,count,beyondSpace,accumulateSpace);
+            Long doSpace = getSceneLockedIds(lockedIds, list, count, beyondSpace, accumulateSpace);
+            beyondSpace -= doSpace;
+            getScenePlusLockedIds(lockedIds,plusList,count,beyondSpace,accumulateSpace);
         }
 
-        lockOrUnLockScenes(proLockedIds,plusLockedIds,payStatus);
+        lockOrUnLockScenes(lockedIds,payStatus);
     }
 
 
@@ -248,7 +249,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
 
     // payStatus 为 -2 封存，为 1 解封
-    private void lockOrUnLockScenes(List<Long> lockedIds,List<Long> plusLockedIds,Integer payStatus) {
+    private void lockOrUnLockScenes(List<Long> lockedIds,Integer payStatus) {
         if (lockedIds == null || lockedIds.size() == 0){
             return;
         }
@@ -260,7 +261,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         LambdaUpdateWrapper<ScenePlus> updatePlusWrapper = new LambdaUpdateWrapper<>();
         updatePlusWrapper.set(ScenePlus::getPayStatus,payStatus)
-                .in(ScenePlus::getId,plusLockedIds);
+                .in(ScenePlus::getId,lockedIds);
         scenePlusService.update(updatePlusWrapper);
 
         this.updateOssStatus(lockedIds,payStatus);