国际服深时下载次数限制bug

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

@@ -144,10 +144,6 @@ public class DownService implements IDownService {
         CameraType cameraType = cameraTypeService.getByCameraId(cameraId);
         isObj = isObj == null ?0 :isObj;
 
-        log.info("down--cameraType:{},isObj:{}",cameraType.getCameraType(),isObj);
-        if(cameraType.getIsLaser() == 1 && isObj !=1){ //深时场景
-            return SSDownload(sceneNum,userName);
-        }
         DownVo downVo = new DownVo();
         User user = userService.getByUserName(userName);
         if(user == null){
@@ -168,6 +164,12 @@ public class DownService implements IDownService {
             downVo.setDownloadStatus(-1);
             return downVo;
         }
+
+        log.info("down--cameraType:{},isObj:{}",cameraType.getCameraType(),isObj);
+        if(cameraType.getIsLaser() == 1 && isObj !=1){ //深时场景
+            return SSDownload(sceneNum,user);
+        }
+
         Integer sceneVersion = getSceneVersion(scenePro, plus);
 
         Map<String,String> params = new HashMap<>(2);
@@ -297,14 +299,8 @@ public class DownService implements IDownService {
     /**
      * downloadStatus -1下载失败  1下载成功
      */
-    private DownVo SSDownload(String sceneNum,String userName) {
+    private DownVo SSDownload(String sceneNum,User user) {
         DownVo downVo = new DownVo();
-
-        User user = userService.getByUserName(userName);
-        if(user == null || user.getSsDownloadNumTotal() - user.getSsDownloadNum() <= 0){
-            downVo.setDownloadStatus(-1);
-            return downVo;
-        }
         //status ：0:正在生成 1，初次生成  2，已经生成直接下载 3，重新生成
         SSDownSceneVo vo = laserService.downOfflineScene(sceneNum);
         if(vo == null){