1

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

@@ -333,15 +333,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         Long subSpace =  oldCameraDetail.getTotalSpace() - oldUseSpace;
 
-        if(oldCameraDetail.getType() != 11 && oldCameraDetail.getType() != 10 && subSpace >0){           //有剩余容量解封容量内场景
-            this.lockOrUnLockBySpace(oldCameraDetail,oldCameraDetail.getCameraId(),1);
-        }
 
-        Integer payStatus =  scenePro == null ? scenePlus.getPayStatus() : scenePro.getPayStatus();
 
-        if(cameraDetail.getType() != 11 && cameraDetail.getType() != 10 && payStatus!=1){           //有剩余容量解封容量内场景
-            this.lockOrUnLockBySpace(scenePro,scenePlus,1);
-        }
 
 
         if(scenePro!=null){
@@ -377,6 +370,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         cameraDetailService.initSpace(oldCameraDetail);
         cameraDetailService.initSpace(cameraDetail);
+
+        if(oldCameraDetail.getType() != 11 && oldCameraDetail.getType() != 10 && subSpace >0){           //有剩余容量解封容量内场景
+            this.lockOrUnLockBySpace(oldCameraDetail.getCameraId());
+        }
+        if(cameraDetail.getType() != 11 && cameraDetail.getType() != 10){           //有剩余容量解封容量内场景
+            this.lockOrUnLockBySpace(cameraDetail.getCameraId());
+        }
     }
 
 

src/main/java/com/fdkankan/manage/test/TestController.java

@@ -144,9 +144,7 @@ public class TestController {
 
     private String[] getSnCodeTest(){
         String res [] = {
-                "0705CCDB8",
                 "0292D9F64",
-                "916ED6689",
         };
         return res;
     }