Merge branch 'task-lyh-inctype2' into test

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

@@ -267,13 +267,14 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 }
                 scenePlus.setSceneStatus(-2);
                 this.updateById(scenePlus);
-                cameraDetailService.addUsedSpace(cameraDetail,plusExt.getSpace());
                 sceneCopyLogService.saveByNum(oldNum,newNum,scenePlus.getUserId());
 
                 Boolean checkSpace = cameraDetailService.checkSpace(cameraDetail.getCameraId(), plusExt.getSpace());
                 if(!checkSpace){
                     sceneProService.lockOrUnLockScenes(Arrays.asList(scenePlus.getId()),-2);
                 }
+                cameraDetailService.addUsedSpace(cameraDetail,plusExt.getSpace());
+
             }catch (Exception e){
                 log.error("复制场景失败-V4-sceneNum:{},error:{}",oldNum,e);
                 scenePlus.setSceneStatus(-1);

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

@@ -805,13 +805,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 scenePro.setStatus(-2);
                 this.updateById(scenePro);
 
-                cameraDetailService.addUsedSpace(cameraDetail,scenePro.getSpace());
                 sceneCopyLogService.saveByNum(oldNum,newNum,scenePro.getUserId());
 
                 Boolean checkSpace = cameraDetailService.checkSpace(cameraDetail.getCameraId(), scenePro.getSpace());
                 if(!checkSpace){
                     this.lockOrUnLockScenes(Arrays.asList(scenePro.getId()),-2);
                 }
+                cameraDetailService.addUsedSpace(cameraDetail,scenePro.getSpace());
 
             }catch ( Exception e){
                 log.error("复制场景失败-sceneNum:{},error:{}",oldNum,e);