Merge branch 'feature-容量计算方式改造-20230624-dsx' into test

src/main/java/com/fdkankan/contro/service/impl/ScenePlusServiceImpl.java

@@ -118,8 +118,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
         LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<ScenePlus>()
                 .eq(ScenePlus::getCameraId, cameraId)
-                .in(ScenePlus::getSceneStatus, SceneStatus.SUCCESS.code(), SceneStatus.NO_DISPLAY.code())
-                .eq(ScenePlus::getPayStatus, PayStatus.PAY.code());
+                .in(ScenePlus::getSceneStatus, SceneStatus.SUCCESS.code(), SceneStatus.NO_DISPLAY.code());
 
         SpaceType spaceType = SpaceType.get(spaceTypeStr);
         switch (spaceType){

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

@@ -36,8 +36,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     public Long sumUsedSpaceByCameraId(Long cameraId, String spaceTypeStr) {
         LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<ScenePro>()
                 .eq(ScenePro::getCameraId, cameraId)
-                .in(ScenePro::getStatus, SceneStatus.SUCCESS.code(), SceneStatus.NO_DISPLAY.code())
-                .eq(ScenePro::getPayStatus, PayStatus.PAY.code());
+                .in(ScenePro::getStatus, SceneStatus.SUCCESS.code(), SceneStatus.NO_DISPLAY.code());
 
         SpaceType spaceType = SpaceType.get(spaceTypeStr);
         switch (spaceType){