|
@@ -2979,6 +2979,7 @@ public class ApiController {
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
int score = 0;
|
|
|
boolean autoRejectFlag = false;
|
|
|
+ String msg = "";
|
|
|
WmWkAlbum wmWkAlbum = null;
|
|
|
WmWkArticle wmWkArticle = null;
|
|
|
WmScorePackageStatus scorePackageStatus = null;
|
|
@@ -3201,6 +3202,9 @@ public class ApiController {
|
|
|
log.warn("完成任务积分值已经超过上限,设置为0");
|
|
|
wmTask.setScore(0);
|
|
|
}
|
|
|
+ msg = String.format("转发类任务所得积分不得大于积分包值的%d%s",
|
|
|
+ new BigDecimal(value).multiply(new BigDecimal("100"))
|
|
|
+ .setScale(0, BigDecimal.ROUND_HALF_UP).intValue(), "%");
|
|
|
}
|
|
|
|
|
|
// 校验结果为0积分的自动审核不通过
|
|
@@ -3269,22 +3273,25 @@ public class ApiController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
if ("album".equalsIgnoreCase(taskCategoryName)) {
|
|
|
if ("share".equalsIgnoreCase(type)) {
|
|
|
wmWkAlbum.setForwardNum(wmWkAlbum.getForwardNum() + 1);
|
|
|
}
|
|
|
wmWkAlbumService.updateById(wmWkAlbum);
|
|
|
wmWkAlbum.setScore(String.valueOf(score));
|
|
|
- return R.ok(wmWkAlbum);
|
|
|
+
|
|
|
+ return R.ok(wmWkAlbum, msg);
|
|
|
} else if ("article".equalsIgnoreCase(taskCategoryName)) {
|
|
|
if ("share".equalsIgnoreCase(type)) {
|
|
|
wmWkArticle.setForwardNum(wmWkArticle.getForwardNum() + 1);
|
|
|
}
|
|
|
wmWkArticleService.updateById(wmWkArticle);
|
|
|
wmWkArticle.setScore(String.valueOf(score));
|
|
|
- return R.ok(wmWkArticle);
|
|
|
+ return R.ok(wmWkArticle, msg);
|
|
|
}
|
|
|
- return R.ok();
|
|
|
+
|
|
|
+ return R.ok(null, msg);
|
|
|
}
|
|
|
|
|
|
|