Merge branch 'task-lyh-inctype2' into test

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

@@ -204,6 +204,15 @@ public class AppCameraService {
                 ScenePro scenePro = sceneProService.getByUnicode(unicode);
                 ScenePlusExt scenePlusExt = scenePlusExtService.getByUnicode(unicode);
                 if(scenePro != null || scenePlusExt !=null){
+                    if(scenePro!= 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){
+                            return new AppCameraSpace(0L,cameraDetail.getUnit());
+                        }
+                    }
                     return new AppCameraSpace(1L,cameraDetail.getUnit());
                 }
             }

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

@@ -332,7 +332,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             cameraVo.setResponseUserIncrement(responseUserIncrement);
             cameraVo.setMemberLevels(userIncrement.getMemberLevels());
             IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
-            if(incrementType != null){
+            if(incrementType != null && userIncrement.getIsExpired() == 0){
                 if("GB".equals(cameraVo.getUnit())){
                     cameraVo.setTotalSpace(String.valueOf(incrementType.getCameraCapacity()));
                     cameraVo.setTotalSpaceStr(incrementType.getCameraCapacity()+".00GB");