che

src/main/java/com/fdkankan/ucenter/controller/TestController.java

@@ -67,8 +67,6 @@ public class TestController extends BaseController {
 
     @GetMapping("checkIncrement")
     public Result checkIncrement() throws Exception {
-        LambdaQueryWrapper<UserIncrement> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(UserIncrement::getIsExpired,1);
         List<UserIncrement> list = userIncrementService.list();
         userIncrementService.lockScene(list);
         return Result.success();

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

@@ -252,6 +252,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         for (Long aLong : spaceList) {
             usedSpace += aLong;
         }
+        cameraDetailService.updateSpaceByCameraId(cameraId,usedSpace);
         //计算时间倒序
         List<SimpleSceneVo> sceneVos = voList.stream().sorted(Comparator.comparing(SimpleSceneVo::getCreateTime).reversed()).collect(Collectors.toList());
         //使用容量大于总容量，不予解封

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

@@ -250,7 +250,14 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
 
     public void lockScene(List<UserIncrement> list){
         for (UserIncrement userIncrement : list) {
-            userIncrement.setIsExpired(1);
+            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());
@@ -261,7 +268,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
             this.updateById(userIncrement);
 
             if(cameraDetail.getType() !=10){
-                sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),-2);
+                sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),payStatus);
             }
         }
     }