1

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

@@ -203,12 +203,12 @@ public class AppCameraService {
                 ScenePro scenePro = sceneProService.getByUnicode(unicode);
                 ScenePlusExt scenePlusExt = scenePlusExtService.getByUnicode(unicode);
                 if(scenePro != null || scenePlusExt !=null){
-                    if(scenePro!= null && scenePro.getPayStatus() !=1){
+                    if(scenePro!= null && scenePro.getStatus() != null &&  scenePro.getStatus() ==-2 &&  scenePro.getPayStatus() != null &&  scenePro.getPayStatus() !=1){
                         return new AppCameraSpace(0L,cameraDetail.getUnit());
                     }
                     if(scenePlusExt!= null ){
                         ScenePlus scenePlus = scenePlusService.getById(scenePlusExt.getPlusId());
-                        if(scenePlus != null && scenePlus.getPayStatus() != 1){
+                        if(scenePlus != null && scenePlus.getSceneStatus() != null  && scenePlus.getSceneStatus() ==-2 && scenePlus.getPayStatus() != null && scenePlus.getPayStatus() != 1){
                             return new AppCameraSpace(0L,cameraDetail.getUnit());
                         }
                     }