Bladeren bron

封存判断

lyhzzz 2 jaren geleden
bovenliggende
commit
8b18d06432
1 gewijzigde bestanden met toevoegingen van 1 en 5 verwijderingen
  1. 1 5
      src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

+ 1 - 5
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -244,10 +244,6 @@ 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);
@@ -271,7 +267,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         List<ScenePro> list = this.list(wrapper);
         List<ScenePlus> plusList = scenePlusService.list(plusWr);
 
-        Long beyondSpace = Math.abs(cameraDetail.getUsedSpace() - totalSpace);
+        Long beyondSpace = cameraDetail.getUsedSpace() - totalSpace;
         if(totalSpace == -1){
             beyondSpace = Long.MAX_VALUE;
         }