|
@@ -3122,13 +3122,11 @@ public class ApiController {
|
|
if (StringUtils.isEmpty(openUserId)) {
|
|
if (StringUtils.isEmpty(openUserId)) {
|
|
log.info("openUserId为null,任务积分为0。");
|
|
log.info("openUserId为null,任务积分为0。");
|
|
wmTask.setScore(0);
|
|
wmTask.setScore(0);
|
|
- autoRejectFlag = true;
|
|
|
|
} else {
|
|
} else {
|
|
String readerOpenId = getReaderOpenId(openUserId.trim());
|
|
String readerOpenId = getReaderOpenId(openUserId.trim());
|
|
if (readerOpenId.contains("null")) {
|
|
if (readerOpenId.contains("null")) {
|
|
log.info("获取阅读者openid失败,积分值为0");
|
|
log.info("获取阅读者openid失败,积分值为0");
|
|
wmTask.setScore(0);
|
|
wmTask.setScore(0);
|
|
- autoRejectFlag = true;
|
|
|
|
} else {
|
|
} else {
|
|
// 过滤文章分享list,如果阅读者已经阅读过同一个分享人分享的的同一篇文章,就不再记录分数
|
|
// 过滤文章分享list,如果阅读者已经阅读过同一个分享人分享的的同一篇文章,就不再记录分数
|
|
List<WmWkArticleShare> shares = wmWkArticleShareList
|
|
List<WmWkArticleShare> shares = wmWkArticleShareList
|
|
@@ -3138,7 +3136,6 @@ public class ApiController {
|
|
if (CollectionUtils.isNotEmpty(shares)) {
|
|
if (CollectionUtils.isNotEmpty(shares)) {
|
|
log.info("同一个分享存在多次打开记录:{}", shares);
|
|
log.info("同一个分享存在多次打开记录:{}", shares);
|
|
wmTask.setScore(0);
|
|
wmTask.setScore(0);
|
|
- autoRejectFlag = true;
|
|
|
|
}
|
|
}
|
|
// 记录阅读者openid
|
|
// 记录阅读者openid
|
|
wmWkArticleShare.setOpenUser(readerOpenId);
|
|
wmWkArticleShare.setOpenUser(readerOpenId);
|
|
@@ -3163,8 +3160,6 @@ public class ApiController {
|
|
wmTask.setTaskUserId(String.valueOf(userVO.getUserId())); //任务提交人
|
|
wmTask.setTaskUserId(String.valueOf(userVO.getUserId())); //任务提交人
|
|
wmTask.setLookintoDate(now); //调研时间
|
|
wmTask.setLookintoDate(now); //调研时间
|
|
wmTask.setUpdateTime(now);
|
|
wmTask.setUpdateTime(now);
|
|
- wmTask.setTaskStatus("2"); //任务状态
|
|
|
|
- wmTask.setSubmitStatus("0");
|
|
|
|
wmTask.setDrugEntId(userVO.getDrugEntId());
|
|
wmTask.setDrugEntId(userVO.getDrugEntId());
|
|
wmTask.setShareImgUrl(sharePicUrl);
|
|
wmTask.setShareImgUrl(sharePicUrl);
|
|
wmTask.setScorePackageId(tWmScorePackage.getId());
|
|
wmTask.setScorePackageId(tWmScorePackage.getId());
|
|
@@ -3205,16 +3200,13 @@ public class ApiController {
|
|
if (sum >= limit) {
|
|
if (sum >= limit) {
|
|
log.warn("完成任务积分值已经超过上限,设置为0");
|
|
log.warn("完成任务积分值已经超过上限,设置为0");
|
|
wmTask.setScore(0);
|
|
wmTask.setScore(0);
|
|
- autoRejectFlag = true;
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
// 校验结果为0积分的自动审核不通过
|
|
// 校验结果为0积分的自动审核不通过
|
|
- if (autoRejectFlag) {
|
|
|
|
- wmTask.setTaskStatus("4");
|
|
|
|
- wmTask.setSubmitStatus("1");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ autoRejectFlag = wmTask.getScore() == 0;
|
|
|
|
+ wmTask.setTaskStatus(autoRejectFlag ? "4" : "2"); //任务状态
|
|
|
|
+ wmTask.setSubmitStatus(autoRejectFlag ? "1" : "0");
|
|
boolean isSave = wmTaskService.save(wmTask); //保存任务
|
|
boolean isSave = wmTaskService.save(wmTask); //保存任务
|
|
|
|
|
|
|
|
|