|
@@ -585,22 +585,7 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
|
|
|
private int getPayStatus(Long cameraId, Long space) throws Exception{
|
|
|
//更新相机使用用量
|
|
|
CameraDetail cameraDetail = cameraDetailService.updateCameraDetailByCameraIdAndSpace(cameraId, space);
|
|
|
- Long totalSpace = cameraDetail.getTotalSpace();
|
|
|
-
|
|
|
- UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
|
|
|
- if(!ObjectUtils.isEmpty(userIncrement) && userIncrement.getIsExpired().equals(ExpiredStatus.NOT_EXPIRED.code())){
|
|
|
- IncrementType type = incrementTypeService.getById(userIncrement.getIncrementTypeId());
|
|
|
- if(type != null){
|
|
|
- Integer cameraCapacity = type.getCameraCapacity();
|
|
|
- if(cameraCapacity == -1){ //无限容量权益
|
|
|
- return PayStatus.PAY.code();
|
|
|
- }else {
|
|
|
- totalSpace = cameraCapacity *1024 * 1024 * 1024L; //权益设置容量
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- return totalSpace.compareTo(cameraDetail.getUsedSpace()) == -1 ? PayStatus.NO_CAPACITY.code() : PayStatus.PAY.code();
|
|
|
+ return PayStatus.PAY.code();
|
|
|
}
|
|
|
|
|
|
public void uploadHouseTypeJson(String num, String floorPlanCardFilePath) {
|