|
@@ -302,12 +302,10 @@ public class CommonServiceImpl implements ICommonService {
|
|
}
|
|
}
|
|
|
|
|
|
//更新相机使用用量,非激光相机或者是空间个数计算方式的,需要叠加相机容量
|
|
//更新相机使用用量,非激光相机或者是空间个数计算方式的,需要叠加相机容量
|
|
- if(CollUtil.isEmpty(laserCamTypeList) || !laserCamTypeList.contains(cameraDetail.getType()) || SpaceType.SP.code().equals(unit)){
|
|
|
|
- cameraDetailService.updateCameraDetailByCameraIdAndSpace(cameraId, space);
|
|
|
|
- }
|
|
|
|
|
|
+ cameraDetailService.updateCameraDetailByCameraIdAndSpace(cameraId, space);
|
|
|
|
|
|
//无限容量或者激光相机,直接返回已支付
|
|
//无限容量或者激光相机,直接返回已支付
|
|
- if(limit == -1 || (CollUtil.isNotEmpty(laserCamTypeList) && laserCamTypeList.contains(cameraDetail.getType()))){
|
|
|
|
|
|
+ if(limit == -1 || ("gn".equals(env) && CollUtil.isNotEmpty(laserCamTypeList) && laserCamTypeList.contains(cameraDetail.getType()))){
|
|
return PayStatus.PAY.code();
|
|
return PayStatus.PAY.code();
|
|
}
|
|
}
|
|
|
|
|