Merge branch 'lyh-pay-status-mq' into test

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

@@ -275,7 +275,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 if(totalSpace1 != null ){
                     totalSpace = totalSpace1;
                 }
-                if(cameraDetail.getUsedSpace() + plusExt.getSpace()  > totalSpace ){
+                if(totalSpace > 0 && cameraDetail.getUsedSpace() + plusExt.getSpace()  > totalSpace ){
                     sceneProService.lockOrUnLockScenes(Arrays.asList(scenePlus.getId()),-2);
                 }
             }catch (Exception e){

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

@@ -806,7 +806,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 if(totalSpace1 != null ){
                     totalSpace = totalSpace1;
                 }
-                if(cameraDetail.getUsedSpace() + scenePro.getSpace()  > totalSpace ){
+                if(totalSpace >0 && cameraDetail.getUsedSpace() + scenePro.getSpace()  > totalSpace ){
                     this.lockOrUnLockScenes(Arrays.asList(scenePro.getId()),-2);
                 }