|
|
@@ -3012,6 +3012,7 @@ public class ApiController {
|
|
|
// 获取分享人
|
|
|
SysUser sysUser = sysUserService.getById(shareUserId);
|
|
|
|
|
|
+ int displayScore = 0;
|
|
|
if (null != sysUser) {
|
|
|
UserVO userVO = sysUserService.selectUserVoById(sysUser.getUserId());
|
|
|
if (null != userVO) {
|
|
|
@@ -3208,7 +3209,8 @@ public class ApiController {
|
|
|
}
|
|
|
|
|
|
// 校验结果为0积分的自动审核不通过
|
|
|
- autoRejectFlag = wmTask.getScore() == 0;
|
|
|
+ autoRejectFlag = (displayScore = wmTask.getScore() )== 0;
|
|
|
+
|
|
|
wmTask.setTaskStatus(autoRejectFlag ? "4" : "2"); //任务状态
|
|
|
wmTask.setSubmitStatus(autoRejectFlag ? "1" : "0");
|
|
|
boolean isSave = wmTaskService.save(wmTask); //保存任务
|
|
|
@@ -3268,16 +3270,16 @@ public class ApiController {
|
|
|
|
|
|
}
|
|
|
|
|
|
- // 正常的提示
|
|
|
- if (StrUtil.isNotEmpty(msg)){
|
|
|
- msg = String.format("转发成功，获得%d积分。", wmTask.getScore());
|
|
|
- }
|
|
|
} else {
|
|
|
return R.failed("任务保存失败");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 正常的提示
|
|
|
+ if (StringUtils.isEmpty(msg)){
|
|
|
+ msg = displayScore == 0 ? "成功" : String.format("转发成功，获得%d积分。", displayScore);
|
|
|
+ }
|
|
|
|
|
|
if ("album".equalsIgnoreCase(taskCategoryName)) {
|
|
|
if ("share".equalsIgnoreCase(type)) {
|
shc