Merge remote-tracking branch 'origin/test' into test

src/main/java/com/fdkankan/ucenter/controller/SceneController.java

@@ -118,7 +118,7 @@ public class SceneController extends BaseController {
      */
     @PostMapping("/checkDownload")
     public Result checkDownload(@RequestBody SceneParam param) throws Exception {
-        return Result.success( downService.checkDownLoad(param.getSceneNum()) );
+        return Result.success( downService.checkDownLoad(param.getSceneNum(),param.getIsObj()) );
     }
     /**
      * 校验该场景有无下载资格
@@ -128,7 +128,7 @@ public class SceneController extends BaseController {
     @PostMapping("/downloadScene")
     public Result downloadScene(@RequestBody SceneParam param) throws Exception{
         String username = JwtUtil.getUsername(getToken());
-        return Result.success(downService.down(param.getSceneNum(),username));
+        return Result.success(downService.down(param.getSceneNum(),username,param.getIsObj()));
     }
 
     /**
@@ -139,7 +139,7 @@ public class SceneController extends BaseController {
     @PostMapping("/downloadProcess")
     public Result downloadProcess(@RequestBody SceneParam param) throws Exception{
         User user = userService.getByUserName(JwtUtil.getUsername(this.getToken()));
-        DownloadProcessVo downloadProcessVo = downService.downloadProcess(user.getId(), param.getSceneNum());
+        DownloadProcessVo downloadProcessVo = downService.downloadProcess(user.getId(), param.getSceneNum(),param.getIsObj());
         if(downloadProcessVo.getStatus() == DownloadStatusEnum.DOWNLOAD_FAILED_CODE){
             return Result.failure("下载失败！");
         }

src/main/java/com/fdkankan/ucenter/service/IDownService.java

@@ -6,9 +6,9 @@ import com.fdkankan.ucenter.vo.response.DownloadProcessVo;
 
 public interface IDownService {
 
-    DownVo checkDownLoad(String sceneNum);
+    DownVo checkDownLoad(String sceneNum,Integer isObj);
 
-    DownVo down(String sceneNum,String userName);
+    DownVo down(String sceneNum,String userName,Integer isObj);
 
-    DownloadProcessVo downloadProcess(Long userId, String num);
+    DownloadProcessVo downloadProcess(Long userId,String num,Integer isObj);
 }

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

@@ -50,7 +50,7 @@ public class DownService implements IDownService {
 
 
     @Override
-    public DownVo checkDownLoad(String sceneNum) {
+    public DownVo checkDownLoad(String sceneNum,Integer isObj) {
         if(StringUtils.isEmpty(sceneNum)){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
@@ -60,7 +60,7 @@ public class DownService implements IDownService {
             throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
         }
         Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : plus.getSceneSource();
-        Integer isObj = scenePro !=null ? scenePro.getIsObj() : scenePlusExtService.getByPlusId(plus.getId()).getIsObj();
+        isObj = isObj == null ?0 :isObj;
 
         log.info("checkDownLoad--sceneType:{},isObj:{}",sceneType,isObj);
         if(sceneType == 4 && isObj !=1){ //深时场景
@@ -120,7 +120,7 @@ public class DownService implements IDownService {
     }
 
     @Override
-    public DownVo down(String sceneNum,String userName) {
+    public DownVo down(String sceneNum,String userName,Integer isObj) {
         if(StringUtils.isEmpty(sceneNum) || StringUtils.isEmpty(userName)){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
@@ -131,7 +131,7 @@ public class DownService implements IDownService {
         }
         Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : scenePlus.getSceneSource();
 
-        Integer isObj = scenePro !=null ? scenePro.getIsObj() : scenePlusExtService.getByPlusId(scenePlus.getId()).getIsObj();
+        isObj = isObj == null ?0 :isObj;
 
         log.info("down--sceneType:{},isObj:{}",sceneType,isObj);
         if(sceneType == 4 && isObj !=1){ //深时场景
@@ -178,7 +178,7 @@ public class DownService implements IDownService {
 
         //修改用户的下载次数
         if(sceneType == 4){
-            user.setDownloadNum(user.getSsDownloadNum() + 1);
+            user.setSsDownloadNum(user.getSsDownloadNum() + 1);
         }else {
             user.setDownloadNum(user.getDownloadNum() + 1);
         }
@@ -196,7 +196,7 @@ public class DownService implements IDownService {
     }
 
     @Override
-    public DownloadProcessVo downloadProcess(Long userId, String sceneNum) {
+    public DownloadProcessVo downloadProcess(Long userId, String sceneNum,Integer isObj) {
         if (StringUtils.isEmpty(sceneNum)) {
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
@@ -207,7 +207,7 @@ public class DownService implements IDownService {
         }
         Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : scenePlus.getSceneSource();
 
-        Integer isObj = scenePro !=null ? scenePro.getIsObj() : scenePlusExtService.getByPlusId(scenePlus.getId()).getIsObj();
+        isObj = isObj == null ?0 :isObj;
 
         log.info("downloadProcess--sceneType:{},isObj:{}",sceneType,isObj);
         if(sceneType == 4 && isObj !=1){ //深时场景

src/main/resources/logback-spring.xml

@@ -78,7 +78,7 @@
 				<maxFileSize>100MB</maxFileSize>
 			</timeBasedFileNamingAndTriggeringPolicy>
 			<!--日志文件保留天数 -->
-			<maxHistory>15</maxHistory>
+			<maxHistory>30</maxHistory>
 		</rollingPolicy>
 		<!-- 此日志文件只记录info级别的 -->
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">