大理

src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -339,31 +339,31 @@ public class CommonServiceImpl implements ICommonService {
     @Override
     public int getPayStatus(Long cameraId, Long space, JSONObject dataFdageJson){
         //查询权益统计容量的方式
-        String unit = SpaceType.GB.code();
-        CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
-        if(StrUtil.isNotEmpty(cameraDetail.getUnit())){
-            unit = cameraDetail.getUnit();
-        }
-        Long limit = this.getSpaceLimit(cameraDetail);
-
-        if(SpaceType.SP.code().equals(unit)){//如果按空间方式统计，则space置为1
-            space = 1L;
-        }
-
-        //更新相机使用用量，非激光相机或者是空间个数计算方式的，需要叠加相机容量
-        cameraDetailService.updateCameraDetailByCameraIdAndSpace(cameraId, space);
-
-        //无限容量或者激光相机或者文保vr，直接返回已支付
-        if(limit == -1
-                || ("gn".equals(env) && CollUtil.isNotEmpty(laserCamTypeList) && laserCamTypeList.contains(cameraDetail.getType()))
-                || this.checkIsSpVr(dataFdageJson, cameraDetail)){
-            return PayStatus.PAY.code();
-        }
-
-        Long usedSpace = cameraService.getUsedSpace(cameraId, unit);
-        if(usedSpace + space > limit){
-            return PayStatus.NO_CAPACITY.code();
-        }
+//        String unit = SpaceType.GB.code();
+//        CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
+//        if(StrUtil.isNotEmpty(cameraDetail.getUnit())){
+//            unit = cameraDetail.getUnit();
+//        }
+//        Long limit = this.getSpaceLimit(cameraDetail);
+//
+//        if(SpaceType.SP.code().equals(unit)){//如果按空间方式统计，则space置为1
+//            space = 1L;
+//        }
+//
+//        //更新相机使用用量，非激光相机或者是空间个数计算方式的，需要叠加相机容量
+//        cameraDetailService.updateCameraDetailByCameraIdAndSpace(cameraId, space);
+//
+//        //无限容量或者激光相机或者文保vr，直接返回已支付
+//        if(limit == -1
+//                || ("gn".equals(env) && CollUtil.isNotEmpty(laserCamTypeList) && laserCamTypeList.contains(cameraDetail.getType()))
+//                || this.checkIsSpVr(dataFdageJson, cameraDetail)){
+//            return PayStatus.PAY.code();
+//        }
+//
+//        Long usedSpace = cameraService.getUsedSpace(cameraId, unit);
+//        if(usedSpace + space > limit){
+//            return PayStatus.NO_CAPACITY.code();
+//        }
 
         return PayStatus.PAY.code();
     }

src/main/java/com/fdkankan/contro/service/impl/ScenePlusServiceImpl.java

@@ -50,26 +50,26 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     public ResultData resetSpace(String num){
         ScenePlus scenePlus = this.getScenePlusByNum(num);
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
-        if(Objects.isNull(scenePlus)){
-            log.info("该场景不存在无法重置容量，场景码为：" + num);
-            return ResultData.error(ErrorCode.FAILURE_CODE_5058);
-        }
-        if(scenePlus.getSceneStatus() == SceneStatus.EXCEED_SPACE.code()){//超出容量的场景不需要更新容量
-            return ResultData.ok();
-        }
-        if(!ObjectUtils.isEmpty(scenePlusExt) && !ObjectUtils.isEmpty(scenePlusExt.getSpace())){
-            Long space = -scenePlusExt.getSpace();
-            CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
-            String spaceType = cameraDetail.getUnit();
-            if(spaceType.equals(SpaceType.SP.code())){
-                space = -1L;
-            }
-            if(scenePlus.getSceneSource() == SceneSource.BM.code()
-                    || scenePlus.getSceneSource() == SceneSource.ZT.code()
-                    || (spaceType.equals(SpaceType.SP.code()))){
-                cameraDetailService.updateCameraDetailByCameraIdAndSpace(scenePlus.getCameraId(), space);
-            }
-        }
+//        if(Objects.isNull(scenePlus)){
+//            log.info("该场景不存在无法重置容量，场景码为：" + num);
+//            return ResultData.error(ErrorCode.FAILURE_CODE_5058);
+//        }
+//        if(scenePlus.getSceneStatus() == SceneStatus.EXCEED_SPACE.code()){//超出容量的场景不需要更新容量
+//            return ResultData.ok();
+//        }
+//        if(!ObjectUtils.isEmpty(scenePlusExt) && !ObjectUtils.isEmpty(scenePlusExt.getSpace())){
+//            Long space = -scenePlusExt.getSpace();
+//            CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
+//            String spaceType = cameraDetail.getUnit();
+//            if(spaceType.equals(SpaceType.SP.code())){
+//                space = -1L;
+//            }
+//            if(scenePlus.getSceneSource() == SceneSource.BM.code()
+//                    || scenePlus.getSceneSource() == SceneSource.ZT.code()
+//                    || (spaceType.equals(SpaceType.SP.code()))){
+//                cameraDetailService.updateCameraDetailByCameraIdAndSpace(scenePlus.getCameraId(), space);
+//            }
+//        }
 
         scenePlusExt.setSpace(Long.parseLong("0"));
         scenePlusExtService.updateById(scenePlusExt);