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

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

@@ -268,20 +268,21 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             return;
         }
         List<Long> lockedIds = new ArrayList<>();
-        Long cameraDetailSpace = usedSpace;
-        if(usedSpace < totalSpace){  //使用容量小于总容量，解封
-            sceneVos = sceneVos.stream().filter(entity -> entity.getPayStatus() !=1).collect(Collectors.toList());
-            Long space = getSceneUnLockedIds(lockedIds, sceneVos, totalSpace - usedSpace);
-            cameraDetailSpace += space;
-            lockOrUnLockScenes(lockedIds,1);
-        }
         if(usedSpace > totalSpace){
             sceneVos = sceneVos.stream().filter(entity -> entity.getPayStatus() ==1).collect(Collectors.toList());
             Long space = getSceneLockedIds(lockedIds,sceneVos,usedSpace - totalSpace);
             lockOrUnLockScenes(lockedIds,-2);
-            cameraDetailSpace -= space;
+            usedSpace -= space;
         }
-        cameraDetailService.updateSpaceByCameraId(cameraId,cameraDetailSpace);
+
+        if(usedSpace < totalSpace){  //使用容量小于总容量，解封
+            sceneVos = sceneVos.stream().filter(entity -> entity.getPayStatus() !=1).collect(Collectors.toList());
+            Long space = getSceneUnLockedIds(lockedIds, sceneVos, totalSpace - usedSpace);
+            usedSpace += space;
+            lockOrUnLockScenes(lockedIds,1);
+        }
+
+        cameraDetailService.updateSpaceByCameraId(cameraId,usedSpace);
     }
 
     private Long getSceneUnLockedIds(List<Long> lockedIds ,List<SimpleSceneVo> list,Long beyondSpace){