Merge remote-tracking branch 'origin/task-lyh-sg' into test

# Conflicts:
#	src/main/java/com/fdkankan/ucenter/service/impl/DownService.java

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

@@ -62,8 +62,8 @@ public class DownService implements IDownService {
         Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : plus.getSceneSource();
         isObj = isObj == null ?0 :isObj;
 
-        //log.info("checkDownLoad--sceneType:{},isObj:{}",sceneType,isObj);
-        if(sceneType == 4 && isObj !=1){ //深时场景
+        log.info("checkDownLoad--sceneType:{},isObj:{}",sceneType,isObj);
+        if((sceneType == 4 || sceneType == 5) && isObj !=1){ //深时场景
             return SSCheckDownload(sceneNum);
         }
         SceneDownloadLog sceneDownloadLog;
@@ -133,8 +133,8 @@ public class DownService implements IDownService {
 
         isObj = isObj == null ?0 :isObj;
 
-        //log.info("down--sceneType:{},isObj:{}",sceneType,isObj);
-        if(sceneType == 4 && isObj !=1){ //深时场景
+        log.info("down--sceneType:{},isObj:{}",sceneType,isObj);
+        if((sceneType == 4|| sceneType == 5) && isObj !=1){ //深时场景
             return SSDownload(sceneNum,userName);
         }
         DownVo downVo = new DownVo();
@@ -145,7 +145,7 @@ public class DownService implements IDownService {
         }
         Integer downLoadTotal = 0;
         Integer downLoadNum = 0;
-        if(sceneType == 4){
+        if(sceneType == 4 || sceneType == 5){
             downLoadTotal = user.getSsDownloadNumTotal();
             downLoadNum = user.getSsDownloadNum();
 
@@ -177,7 +177,7 @@ public class DownService implements IDownService {
         redisUtil.lRightPush(downloadTaskKey, JSONObject.toJSONString(params));
 
         //修改用户的下载次数
-        if(sceneType == 4){
+        if(sceneType == 4|| sceneType == 5){
             user.setSsDownloadNum(user.getSsDownloadNum() + 1);
         }else {
             user.setDownloadNum(user.getDownloadNum() + 1);
@@ -209,8 +209,8 @@ public class DownService implements IDownService {
 
         isObj = isObj == null ?0 :isObj;
 
-        //log.info("downloadProcess--sceneType:{},isObj:{}",sceneType,isObj);
-        if(sceneType == 4 && isObj !=1){ //深时场景
+        log.info("downloadProcess--sceneType:{},isObj:{}",sceneType,isObj);
+        if((sceneType == 4 || sceneType == 5 )&& isObj !=1){ //深时场景
             return SSDownloadProcess(sceneNum);
         }
         String redisKey = RedisKey.PREFIX_DOWNLOAD_PROGRESS;