From 5d787b59cff2779054dc2ba1af055b65e0d7be92 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 29 Jul 2020 09:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9-=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E7=AB=AF-=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/ActUserRelationServiceImpl.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java
index 22bc9b42dc..c84e1efa93 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java
@@ -207,7 +207,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
             // 活动只能志愿者参加, 当前用户是否满足条件
             satisfy = this.volunteerParticipationAct(volunteerFlag);
             if (!satisfy){
-                logger.info("活动报名失败，请先认证志愿者");
+                logger.info(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getMsg());
                 resultDTO.setFlag(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getCode());
                 resultDTO.setTip(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getMsg());
                 return new Result<ResiActRegistrationResultDTO>().ok(resultDTO);
@@ -216,7 +216,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
             // 活动不限制志愿者身份，但要求是 居民身份, 当前用户是否满足条件
             satisfy = this.resiParticipationAct(formDTO.getUserId());
             if (!satisfy){
-                logger.info("活动报名失败，请完善居民信息");
+                logger.info(EpmetErrorCode.CANNOT_AUDIT_WARM.getMsg());
                 resultDTO.setFlag(EpmetErrorCode.CANNOT_AUDIT_WARM.getCode());
                 resultDTO.setTip(EpmetErrorCode.CANNOT_AUDIT_WARM.getMsg());
                 return new Result<ResiActRegistrationResultDTO>().ok(resultDTO);
@@ -226,7 +226,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
             // 开始报名
             boolean actTimeConflict = this.actStartSignUp(actInfoDTO, formDTO, volunteerFlag);
             if (!actTimeConflict){
-                logger.info("报名失败。您本次报名活动时间与已报名活动时间间隔较短，为了不影响您已报名的活动，请选择其他时间的活动，谢谢。");
+                logger.info(EpmetErrorCode.ACT_TIME_CONFLICT.getMsg());
                 resultDTO.setFlag(EpmetErrorCode.ACT_TIME_CONFLICT.getCode());
                 resultDTO.setTip(EpmetErrorCode.ACT_TIME_CONFLICT.getMsg());
                 return new Result<ResiActRegistrationResultDTO>().ok(resultDTO);