diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java index 85ed907b4a..48365aa8a6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java @@ -60,10 +60,11 @@ public class CertificationAddFormDTO implements Serializable { */ private String remark; - /** - * 验证码 - */ - private String code; + // 烟台不校验验证码 + // /** + // * 验证码 + // */ + // private String code; /** * 是否需要发送站内信: diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 3154e8c774..faf959d7a7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -167,11 +167,11 @@ public class UserBadgeServiceImpl implements UserBadgeService { ub.setAuditStatus(StrConstant.EPMETY_STR); ub.setIsCertificated(BadgeConstant.NO); } else { - //申请了 + //申请了,但是未通过的:rejected:审核驳回;auditing:审核中 ub.setIsReject(entity.getAuditStatus().equals(BadgeConstant.REJECTED)); ub.setIsLighted(BadgeConstant.NO); ub.setAuditStatus(entity.getAuditStatus()); - ub.setIsCertificated(BadgeConstant.YES); + ub.setIsCertificated(BadgeConstant.NO); } } @@ -298,12 +298,13 @@ public class UserBadgeServiceImpl implements UserBadgeService { authFieldFormDTO.setBadgeId(certificationAddFormDTO.getBadgeId()); validateParams(certificationAddFormDTO, authFieldFormDTO); - if (StringUtils.isNotBlank(certificationAddFormDTO.getMobile())) { + //烟台不校验验证码 + /*if (StringUtils.isNotBlank(certificationAddFormDTO.getMobile())) { String smsCode = userBadgeRedis.getBadgeSmsCode(certificationAddFormDTO.getMobile()); if (!StringUtils.isNotBlank(smsCode)) { return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode()); } - } + }*/ // 0309:如果是党员徽章去判断居民信息-类别是否是党员 String auditRemark=""; BadgeEntity badgeEntity = badgeDao.selectBadgeInfo(EpmetRequestHolder.getLoginUserCustomerId(),certificationAddFormDTO.getBadgeId());