Browse Source

爱心互助-居民端-提示信息变更

master
zhangyongzhangyong 5 years ago
parent
commit
5d787b59cf
  1. 6
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java

6
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); satisfy = this.volunteerParticipationAct(volunteerFlag);
if (!satisfy){ if (!satisfy){
logger.info("活动报名失败,请先认证志愿者"); logger.info(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getMsg());
resultDTO.setFlag(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getCode()); resultDTO.setFlag(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getCode());
resultDTO.setTip(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getMsg()); resultDTO.setTip(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getMsg());
return new Result<ResiActRegistrationResultDTO>().ok(resultDTO); return new Result<ResiActRegistrationResultDTO>().ok(resultDTO);
@ -216,7 +216,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
// 活动不限制志愿者身份,但要求是 居民身份, 当前用户是否满足条件 // 活动不限制志愿者身份,但要求是 居民身份, 当前用户是否满足条件
satisfy = this.resiParticipationAct(formDTO.getUserId()); satisfy = this.resiParticipationAct(formDTO.getUserId());
if (!satisfy){ if (!satisfy){
logger.info("活动报名失败,请完善居民信息"); logger.info(EpmetErrorCode.CANNOT_AUDIT_WARM.getMsg());
resultDTO.setFlag(EpmetErrorCode.CANNOT_AUDIT_WARM.getCode()); resultDTO.setFlag(EpmetErrorCode.CANNOT_AUDIT_WARM.getCode());
resultDTO.setTip(EpmetErrorCode.CANNOT_AUDIT_WARM.getMsg()); resultDTO.setTip(EpmetErrorCode.CANNOT_AUDIT_WARM.getMsg());
return new Result<ResiActRegistrationResultDTO>().ok(resultDTO); return new Result<ResiActRegistrationResultDTO>().ok(resultDTO);
@ -226,7 +226,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
// 开始报名 // 开始报名
boolean actTimeConflict = this.actStartSignUp(actInfoDTO, formDTO, volunteerFlag); boolean actTimeConflict = this.actStartSignUp(actInfoDTO, formDTO, volunteerFlag);
if (!actTimeConflict){ if (!actTimeConflict){
logger.info("报名失败。您本次报名活动时间与已报名活动时间间隔较短,为了不影响您已报名的活动,请选择其他时间的活动,谢谢。"); logger.info(EpmetErrorCode.ACT_TIME_CONFLICT.getMsg());
resultDTO.setFlag(EpmetErrorCode.ACT_TIME_CONFLICT.getCode()); resultDTO.setFlag(EpmetErrorCode.ACT_TIME_CONFLICT.getCode());
resultDTO.setTip(EpmetErrorCode.ACT_TIME_CONFLICT.getMsg()); resultDTO.setTip(EpmetErrorCode.ACT_TIME_CONFLICT.getMsg());
return new Result<ResiActRegistrationResultDTO>().ok(resultDTO); return new Result<ResiActRegistrationResultDTO>().ok(resultDTO);

Loading…
Cancel
Save