解封判断容量

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

@@ -150,12 +150,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         log.info("lockOrUnLockBySpace---cameraId:{},payStatus:{},totalSpace:{},useSpace{}",
                 cameraId,payStatus,totalSpace,cameraDetail.getUsedSpace());
         if(payStatus == 1){         //解封，判断用户权益,用户会员权益无限容量
+            if (totalSpace != -1 && totalSpace <= cameraDetail.getUsedSpace()) {
+                // 总容量小于已使用容量，不予解封
+                return;
+            }
             wrapper.orderByAsc(ScenePro::getCreateTime);
             plusWr.orderByAsc(ScenePlus::getCreateTime);
             wrapper.eq(ScenePro::getPayStatus,-2);
             plusWr.eq(ScenePlus::getPayStatus,-2);
         }else {
-            if (totalSpace >= cameraDetail.getUsedSpace()) {
+            if (totalSpace == -1 || totalSpace >= cameraDetail.getUsedSpace()) {
                 // 总容量大于已使用容量，不予封存
                 return;
             }