|
|
@@ -3015,6 +3015,7 @@ public class ApiController {
|
|
|
int score = 0;
|
|
|
WmWkAlbum wmWkAlbum = null;
|
|
|
WmWkArticle wmWkArticle = null;
|
|
|
+ WmScorePackageStatus scorePackageStatus = null;
|
|
|
|
|
|
if (StringUtils.isEmpty(id) || StringUtils.isEmpty(packageId)) {
|
|
|
return R.ok();
|
|
|
@@ -3094,7 +3095,7 @@ public class ApiController {
|
|
|
return R.failed("获取积分包异常，任务保存失败");
|
|
|
}
|
|
|
|
|
|
- WmScorePackageStatus scorePackageStatus = statusList.get(0);
|
|
|
+ scorePackageStatus = statusList.get(0);
|
|
|
|
|
|
WmWkArticleShare wmWkArticleShare = new WmWkArticleShare();
|
|
|
wmWkArticleShare.setShareUserid(userVO.getUserId() + "");
|
|
|
@@ -3211,11 +3212,11 @@ public class ApiController {
|
|
|
|
|
|
|
|
|
// 判断是否保存前最后校验一遍文章分享和文章阅读以及产品分享和产品分享阅读所做的积分值是否在比例范围之内（初始设定为30%）
|
|
|
- if (needToCheckLimit) {
|
|
|
+ if (needToCheckLimit && null != scorePackageStatus) {
|
|
|
String value = sysPublicParamService.getSysPublicParamKeyToValue("SHARE_READ_TASK_SCORE_UPPER_LIMIT_RATIO");
|
|
|
value = StringUtils.isEmpty(value) ? "0.3" : value;
|
|
|
log.warn("系统当前分享类及分享阅读类积分上限：【{}】", value);
|
|
|
- int limit = (int) (tWmScorePackage.getScore() * Double.parseDouble(value));
|
|
|
+ int limit = (int) (Integer.parseInt(scorePackageStatus.getUserScore()) * Double.parseDouble(value));
|
|
|
List<WmTask> taskList = wmTaskService.list(Wrappers.<WmTask>lambdaQuery()
|
|
|
// 两对分享阅读任务
|
|
|
.in(WmTask::getTaskTypeId, Arrays.asList("8", "9", "10", "11"))
|
屈桐