国际服深时场景数量

src/main/java/com/fdkankan/ucenter/httpClient/service/LaserService.java

@@ -56,9 +56,6 @@ public class LaserService {
      */
     public SceneNumVo getLaserSceneNumByUser(String token) {
         SceneNumVo sceneNumVo = new SceneNumVo();
-        if("aws".equals(NacosProperty.uploadType)){
-            return sceneNumVo;
-        }
         try {
             Result sceneNum = laserClient.getSceneNum(token);
             if(sceneNum != null && sceneNum.getCode() == 200){

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

@@ -298,7 +298,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             lockOrUnLockScenes(lockedIds,1);
             return;
         }
-
+        //修改已场景实际容量为准
         Long beyondSpace =  0L;
         Long accumulateSpace = 0L;
         if(payStatus == 1){
@@ -307,8 +307,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             getScenePlusLockedIds(lockedIds, plusList, beyondSpace, accumulateSpace);
         }else {
             beyondSpace =  cameraDetail.getUsedSpace() - totalSpace;
-            getSceneLockedIds(lockedIds, list, beyondSpace, accumulateSpace);
             getScenePlusLockedIds(lockedIds,plusList,beyondSpace,accumulateSpace);
+            getSceneLockedIds(lockedIds, list, beyondSpace, accumulateSpace);
         }
         lockOrUnLockScenes(lockedIds,payStatus);
     }