Merge branch 'master' into release

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -766,7 +766,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 if(cameraCapacity == -1){           //无限容量权益
                     return PayStatus.PAY.code();
                 }else {
-                    totalSpace = cameraCapacity  * 1024 * 1024L;     //权益设置容量
+                    totalSpace = cameraCapacity *1024 * 1024 * 1024L;     //权益设置容量
                 }
             }
         }

src/main/java/com/fdkankan/contro/mq/service/impl/BuildV3SceneServiceImpl.java

@@ -571,10 +571,13 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
         UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
         if(!ObjectUtils.isEmpty(userIncrement) && userIncrement.getIsExpired().equals(ExpiredStatus.NOT_EXPIRED.code())){
             IncrementType type = incrementTypeService.getById(userIncrement.getIncrementTypeId());
-            if (ObjectUtils.isEmpty(type) || type.getType().equals("cn")) {
-                return PayStatus.PAY.code();
-            } else if (type.getType().equals("eur")) {
-                totalSpace = type.getCameraCapacity() * 1024 * 1024L;
+            if(type != null){
+                Integer cameraCapacity = type.getCameraCapacity();
+                if(cameraCapacity == -1){           //无限容量权益
+                    return PayStatus.PAY.code();
+                }else {
+                    totalSpace = cameraCapacity *1024 * 1024 * 1024L;     //权益设置容量
+                }
             }
         }