From d4cc2ed8529f40df40a1a348ceb020de94f5dbe4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 13 九月 2021 20:50:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java
index a6c2f48..6414cec 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java
@@ -69,9 +69,9 @@
Integer isQrCode = comActActivityDO.getIsQrCode();
if (nonNull(isQrCode) && isQrCode.equals(1)) {
//需要签到类型
- int evaluateCount = this.baseMapper.selectCount(new QueryWrapper<ComActActEvaluateDO>()
- .lambda().eq(ComActActEvaluateDO::getUserId, userId).eq(ComActActEvaluateDO::getActivityId, activityId));
- if (evaluateCount <= 0) {
+ int signCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>()
+ .lambda().eq(ComActActSignDO::getUserId, userId).eq(ComActActSignDO::getActivityId, activityId));
+ if (signCount <= 0) {
//未签到，不能评价
return R.fail("未签到，不能评价");
}
@@ -103,7 +103,7 @@
List<ComActActivityDO> comActActivityDOS = comActActivityDAO.selectList(new QueryWrapper<ComActActivityDO>().lambda()
.eq(ComActActivityDO::getStatus, 5)
.eq(ComActActivityDO::getIsDefaultPraise, 0)
- .le(ComActActivityDO::getEndAt, DateUtils.addDays(new Date(), 7)));
+ .le(ComActActivityDO::getEndAt, DateUtils.addDays(new Date(), -7)));
//获取报名记录
if (!ObjectUtils.isEmpty(comActActivityDOS)) {
List<Long> activityIds = comActActivityDOS.stream().map(ComActActivityDO::getId).collect(Collectors.toList());
--
Gitblit v1.7.1