lyhzzz 2 years ago
parent
commit
80d0f357a8

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

@@ -165,7 +165,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
             long usedSpace = cameraDetail.getUsedSpace() - subSpace ;
             long usedSpace = cameraDetail.getUsedSpace() - subSpace ;
             cameraDetail.setUsedSpace(usedSpace < 0 ? 0L :usedSpace);
             cameraDetail.setUsedSpace(usedSpace < 0 ? 0L :usedSpace);
             //解封封存场景
             //解封封存场景
-            sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),1,usedSpace);
+            sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),1,subSpace);
         }
         }
         this.updateBatchById(list);
         this.updateBatchById(list);
     }
     }

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

@@ -231,7 +231,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
      * @param payStatus -2 封存,为 1 解封
      * @param payStatus -2 封存,为 1 解封
      */
      */
     @Override
     @Override
-    public void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, Integer payStatus,Long subSapce) {
+    public void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, Integer payStatus,Long subSpace) {
         LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<ScenePlus> plusWr = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<ScenePlus> plusWr = new LambdaQueryWrapper<>();
         wrapper.eq(ScenePro::getStatus,-2);
         wrapper.eq(ScenePro::getStatus,-2);
@@ -249,8 +249,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
             }
         }
         }
 
 
-        log.info("lockOrUnLockBySpace---cameraId:{},payStatus:{},totalSpace:{},useSpace{}",
-                cameraId,payStatus,totalSpace,cameraDetail.getUsedSpace());
+        log.info("lockOrUnLockBySpace---cameraId:{},payStatus:{},totalSpace:{},useSpace{},subSpace{}",
+                cameraId,payStatus,totalSpace,cameraDetail.getUsedSpace(),subSpace);
         if(payStatus == 1){         //解封,判断用户权益,用户会员权益无限容量
         if(payStatus == 1){         //解封,判断用户权益,用户会员权益无限容量
             wrapper.orderByAsc(ScenePro::getCreateTime);
             wrapper.orderByAsc(ScenePro::getCreateTime);
             plusWr.orderByAsc(ScenePlus::getCreateTime);
             plusWr.orderByAsc(ScenePlus::getCreateTime);