解绑先取消会员权益

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

@@ -101,8 +101,8 @@ public class AppCameraService {
         }
         List<Long> cameraIds = Collections.singletonList(camera.getId());
 
-        cameraDetailService.unbindCamera(cameraIds);                     //取消相机用户关联
         userIncrementService.unbindCamera(cameraIds);                   //取消关联用户权益
+        cameraDetailService.unbindCamera(cameraIds);                     //取消相机用户关联
         sceneProService.bindOrUnCamera(cameraIds,null);             //取消关联场景
         scenePlusService.bindOrUnCamera(cameraIds,null);            //取消关联场景
     }

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

@@ -218,8 +218,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         for (String id : split) {
             cameraIds.add(Long.valueOf(id));
         }
-        cameraDetailService.unbindCamera(cameraIds);                     //取消相机用户关联
         userIncrementService.unbindCamera(cameraIds);                   //取消关联用户权益
+        cameraDetailService.unbindCamera(cameraIds);                     //取消相机用户关联
         sceneService.bindOrUnCamera(cameraIds,null);                //取消关联场景
         sceneProService.bindOrUnCamera(cameraIds,null);             //取消关联场景
         scenePlusService.bindOrUnCamera(cameraIds,null);            //取消关联场景

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

@@ -194,7 +194,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
         }
 
-        log.info("lockOrUnLockBySpace---camerId:{},payStatus:{},totalSpace:{}",cameraId,payStatus,totalSpace);
+        log.info("lockOrUnLockBySpace---cameraId:{},payStatus:{},totalSpace:{},useSpace{}",
+                cameraId,payStatus,totalSpace,cameraDetail.getUsedSpace());
         if(payStatus == 1){         //解封，判断用户权益,用户会员权益无限容量
             wrapper.orderByAsc(ScenePro::getCreateTime);
             plusWr.orderByAsc(ScenePlus::getCreateTime);