权益过期标识

src/main/java/com/fdkankan/ucenter/service/impl/UserIncrementServiceImpl.java

@@ -250,25 +250,22 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
 
     public void lockScene(List<UserIncrement> list){
         for (UserIncrement userIncrement : list) {
-            Integer payStatus = 1;
             if(DateUserUtil.getDate(userIncrement.getIncrementEndTime()).getTime() > new Date().getTime()){
                 userIncrement.setIsExpired(0);
-                payStatus = 1;
             }else {
-                payStatus = -2;
                 userIncrement.setIsExpired(1);
             }
             userIncrement.setUpdateTime(null);
-            //解除相机权益
-            CameraDetail cameraDetail = cameraDetailService.getByCameraId(userIncrement.getCameraId());
-            if(cameraDetail == null){
-                continue;
-            }
-            userIncrement.setCameraId(null);
             this.updateById(userIncrement);
-
-            if(cameraDetail.getType() !=10){
-                sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId());
+            //解除相机权益
+            if(userIncrement.getCameraId() != null){
+                CameraDetail cameraDetail = cameraDetailService.getByCameraId(userIncrement.getCameraId());
+                if(cameraDetail == null){
+                    continue;
+                }
+                if(cameraDetail.getType() !=10){
+                    sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId());
+                }
             }
         }
     }