|
|
@@ -68,15 +68,18 @@ public class IdentityAuthService {
|
|
|
throw new BusinessException("已经审核过");
|
|
|
}
|
|
|
User user = userRepo.findByIdAndDelFalse(auth.getUserId()).orElseThrow(new BusinessException("用户不存在"));
|
|
|
- if (status == AuthStatus.SUCCESS) {
|
|
|
- user.setAuthId(auth.getId());
|
|
|
+ if (user.getAuthStatus() != AuthStatus.SUCCESS) {
|
|
|
+ if (status == AuthStatus.SUCCESS) {
|
|
|
+ user.setAuthId(auth.getId());
|
|
|
+ }
|
|
|
+ user.setAuthStatus(status);
|
|
|
+ userRepo.save(user);
|
|
|
}
|
|
|
auth.setStatus(status);
|
|
|
auth.setReason(reason);
|
|
|
auth.setAutoValidated(true);
|
|
|
identityAuthRepo.save(auth);
|
|
|
- user.setAuthStatus(status);
|
|
|
- userRepo.save(user);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
public List<User> repeat(String idNo, Long userId) {
|
|
|
@@ -126,7 +129,8 @@ public class IdentityAuthService {
|
|
|
boolean success = false;
|
|
|
String reason = null;
|
|
|
|
|
|
- if (!Pattern.matches("[1-9]{1}[0-9]{5}(19|20)[0-9]{2}((0[1-9]{1})|(1[0-2]{1}))((0[1-9]{1})|([1-2]{1}[0-9]{1}|(3[0-1]{1})))[0-9]{3}[0-9x]{1}", identityAuth.getIdNo().toLowerCase())) {
|
|
|
+ if (!Pattern.matches("[1-9]{1}[0-9]{5}(19|20)[0-9]{2}((0[1-9]{1})|(1[0-2]{1}))((0[1-9]{1})|([1-2]{1}[0-9]{1}|(3[0-1]{1})))[0-9]{3}[0-9x]{1}", identityAuth.getIdNo()
|
|
|
+ .toLowerCase())) {
|
|
|
audit(identityAuth.getId(), AuthStatus.FAIL, "身份证格式错误");
|
|
|
return;
|
|
|
} else {
|