From d42fb2fc02075bf3e49118675777a62098743784 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 08 九月 2021 11:20:08 +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/ComActActivityServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index 288a8d7..6fa5fc0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -46,6 +46,8 @@
import lombok.extern.slf4j.Slf4j;
+import static java.util.Objects.isNull;
+
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
* @description: 社区活动
@@ -742,6 +744,13 @@
@Override
public R activitySignIn(ComActActRegistVO comActActRegistVO) {
Long activityId = comActActRegistVO.getActivityId();
+ if (isNull(activityId)) {
+ return R.fail("签到所属活动id不能为空！");
+ }
+ ComActActivityDO comActActivityDO = comActActivityDAO.selectById(activityId);
+ if (isNull(comActActivityDO)) {
+ return R.fail("活动不存在！");
+ }
Long userId = comActActRegistVO.getUserId();
String activitySignInKey = String.join(DELIMITER, ACTIVITY_SIGN_IN, userId.toString(), activityId.toString());
if (stringRedisTemplate.hasKey(activitySignInKey)) {
--
Gitblit v1.7.1