|
@@ -139,7 +139,21 @@ public class DownService implements IDownService {
|
|
}
|
|
}
|
|
DownVo downVo = new DownVo();
|
|
DownVo downVo = new DownVo();
|
|
User user = userService.getByUserName(userName);
|
|
User user = userService.getByUserName(userName);
|
|
- if(user == null || user.getDownloadNumTotal() - user.getDownloadNum() <= 0){
|
|
|
|
|
|
+ if(user == null){
|
|
|
|
+ downVo.setDownloadStatus(-1);
|
|
|
|
+ return downVo;
|
|
|
|
+ }
|
|
|
|
+ Integer downLoadTotal = 0;
|
|
|
|
+ Integer downLoadNum = 0;
|
|
|
|
+ if(sceneType == 4){
|
|
|
|
+ downLoadTotal = user.getSsDownloadNumTotal();
|
|
|
|
+ downLoadNum = user.getSsDownloadNum();
|
|
|
|
+
|
|
|
|
+ }else {
|
|
|
|
+ downLoadTotal = user.getDownloadNumTotal();
|
|
|
|
+ downLoadNum = user.getDownloadNum();
|
|
|
|
+ }
|
|
|
|
+ if(downLoadTotal - downLoadNum <= 0){
|
|
downVo.setDownloadStatus(-1);
|
|
downVo.setDownloadStatus(-1);
|
|
return downVo;
|
|
return downVo;
|
|
}
|
|
}
|
|
@@ -163,9 +177,12 @@ public class DownService implements IDownService {
|
|
redisUtil.lRightPush(downloadTaskKey, JSONObject.toJSONString(params));
|
|
redisUtil.lRightPush(downloadTaskKey, JSONObject.toJSONString(params));
|
|
|
|
|
|
//修改用户的下载次数
|
|
//修改用户的下载次数
|
|
- user.setDownloadNum(user.getDownloadNum() + 1);
|
|
|
|
|
|
+ if(sceneType == 4){
|
|
|
|
+ user.setDownloadNum(user.getSsDownloadNum() + 1);
|
|
|
|
+ }else {
|
|
|
|
+ user.setDownloadNum(user.getDownloadNum() + 1);
|
|
|
|
+ }
|
|
userService.updateById(user);
|
|
userService.updateById(user);
|
|
-
|
|
|
|
SceneDownloadLog sceneDownloadLogEntity = new SceneDownloadLog();
|
|
SceneDownloadLog sceneDownloadLogEntity = new SceneDownloadLog();
|
|
sceneDownloadLogEntity.setUserId(user.getId());
|
|
sceneDownloadLogEntity.setUserId(user.getId());
|
|
sceneDownloadLogEntity.setSceneNum(sceneNum);
|
|
sceneDownloadLogEntity.setSceneNum(sceneNum);
|