|
@@ -127,41 +127,8 @@ public class SceneEditServiceImpl implements ISceneEditService {
|
|
|
sceneAuthVO.setSourceExpired(true);
|
|
|
}
|
|
|
|
|
|
- //判断该场景是否属于增值权益
|
|
|
- boolean isVip = false;
|
|
|
- //获取该相机是否有权益
|
|
|
- boolean isExpired = false;
|
|
|
- Camera sceneCamera = cameraService.getById(scenePlus.getCameraId());
|
|
|
- if(sceneCamera != null){
|
|
|
- UserIncrement userIncrementEntity = userIncrementService.findByCameraId(sceneCamera.getId());
|
|
|
-
|
|
|
- if(userIncrementEntity != null){
|
|
|
- if( userIncrementEntity.getIsExpired().intValue() == 0){
|
|
|
- isVip = true;
|
|
|
- }
|
|
|
- if(userIncrementEntity.getIsExpired().intValue() == 1){
|
|
|
- isExpired = true;
|
|
|
- }
|
|
|
- }else{
|
|
|
- try {
|
|
|
- Date date = DateUtil.parse("2021-09-09 00:00:00", DateExtUtil.dateStyle);
|
|
|
-
|
|
|
- //非07批次的放开
|
|
|
- String pc = sceneCamera.getSnCode().substring(0,2);
|
|
|
- if(!pc.equals("07") ){
|
|
|
- if(sceneCamera.getCreateTime()!=null && date.after(sceneCamera.getCreateTime())){
|
|
|
- isVip = true;
|
|
|
- isExpired = false;
|
|
|
- }
|
|
|
- }
|
|
|
- }catch (Exception e){
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- sceneAuthVO.setIsExpired(isExpired);
|
|
|
- sceneAuthVO.setIsVip(isVip);
|
|
|
+ sceneAuthVO.setIsExpired(false);
|
|
|
+ sceneAuthVO.setIsVip(true);
|
|
|
|
|
|
//判断过期时间
|
|
|
Date date = DateUtil.parse(expectedTime, DateExtUtil.dateStyle);
|