Merge remote-tracking branch 'origin/lyh-bug-bind' into test

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

@@ -235,6 +235,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     public void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, Integer payStatus) {
         LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<ScenePlus> plusWr = new LambdaQueryWrapper<>();
+        wrapper.eq(ScenePro::getStatus,-2);
+        plusWr.eq(ScenePlus::getSceneStatus,-2);
         Long totalSpace = cameraDetail.getTotalSpace();
         UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
         if(userIncrement!=null){
@@ -305,7 +307,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     private void getSceneLockedIds(List<Long> lockedIds ,List<ScenePro> list,Long beyondSpace,Long accumulateSpace){
         if (list != null && list.size() > 0){
             for (ScenePro scenePro : list){
-                accumulateSpace += scenePro.getSpace();
+                accumulateSpace += scenePro.getSpace()== null ? 0 : scenePro.getSpace();
                 if (accumulateSpace.compareTo(beyondSpace) > 0){
                     break;
                 }
@@ -319,7 +321,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             HashMap<Long, ScenePlusExt> byPlusIds = scenePlusExtService.getByPlusIds(plusIds);
             for (ScenePlus scenePlus : list){
                 ScenePlusExt scenePlusExt = byPlusIds.get(scenePlus.getId());
-                accumulateSpace += scenePlusExt.getSpace();
+                accumulateSpace += scenePlusExt.getSpace() == null ? 0 : scenePlusExt.getSpace();
                 if (accumulateSpace.compareTo(beyondSpace) > 0){
                     break;
                 }