1

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

@@ -280,10 +280,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         Long accumulateSpace = 0L;
         Long cameraDetailSpace = 0L;
         if(payStatus == 1){ //解封
+            sceneVos = sceneVos.stream().filter(entity -> entity.getPayStatus() !=1).collect(Collectors.toList());
             beyondSpace =  totalSpace - usedSpace;
             Long space = getSceneLockedIds(lockedIds, sceneVos, beyondSpace, accumulateSpace);
             cameraDetailSpace  = usedSpace + space;
         }else {
+            sceneVos = sceneVos.stream().filter(entity -> entity.getPayStatus() ==1).collect(Collectors.toList());
             beyondSpace =  usedSpace - totalSpace;
             Collections.reverse(sceneVos);
             Long space = getSceneLockedIds(lockedIds,sceneVos, beyondSpace, accumulateSpace);