From 62ce63249ce2458b29912017561d8f0e68d49f13 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Thu, 7 Aug 2025 23:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/userInfo/AdvancementApplyController.java | 9 +++++++++ .../userInfo/impl/AdvancementApplyServiceImpl.java | 2 +- .../service/userInfo/impl/UserInfoServiceImpl.java | 5 +++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java b/src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java index 285421e..9fd2b6c 100644 --- a/src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java +++ b/src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java @@ -72,6 +72,15 @@ public class AdvancementApplyController { String verificationCode = advancementApplyAddRequest.getVerificationCode(); // 校验用户手机号和验证码 userInfoService.checkPhoneAndVerificationCode(phone, verificationCode, UserRoleEnum.STAFF); + // 校验当前身份证号是否申请过 + String idCard = advancementApplyAddRequest.getIdCard(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AdvancementApply::getIdCard, idCard) + .or() + .eq(AdvancementApply::getPhone, phone) + .and(w -> w.in(AdvancementApply::getReviewStatus, ReviewStatusEnum.APPROVED.getValue(), ReviewStatusEnum.PENDING.getValue())); + List applies = advancementApplyService.list(queryWrapper); + ThrowUtils.throwIf(!applies.isEmpty(), ErrorCode.OPERATION_ERROR, "当前手机号或身份证号已申请过"); AdvancementApply advancementApply = commonService.copyProperties(advancementApplyAddRequest, AdvancementApply.class); advancementApplyService.save(advancementApply); return ResultUtils.success(advancementApply.getId()); diff --git a/src/main/java/com/greenorange/promotion/service/userInfo/impl/AdvancementApplyServiceImpl.java b/src/main/java/com/greenorange/promotion/service/userInfo/impl/AdvancementApplyServiceImpl.java index fb6085a..cc2edaf 100644 --- a/src/main/java/com/greenorange/promotion/service/userInfo/impl/AdvancementApplyServiceImpl.java +++ b/src/main/java/com/greenorange/promotion/service/userInfo/impl/AdvancementApplyServiceImpl.java @@ -31,7 +31,7 @@ public class AdvancementApplyServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StringUtils.isNotBlank(name), "name", name); + queryWrapper.like(StringUtils.isNotBlank(name), "name", name); queryWrapper.eq(StringUtils.isNotBlank(phone), "phone", phone); queryWrapper.eq(StringUtils.isNotBlank(reviewStatus), "reviewStatus", reviewStatus); queryWrapper.orderBy(SqlUtils.validSortField(sortField), sortOrder.equals(CommonConstant.SORT_ORDER_DESC), sortField); diff --git a/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java b/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java index 9802325..b696793 100644 --- a/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java +++ b/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java @@ -32,6 +32,7 @@ import com.greenorange.promotion.utils.RegexUtils; import com.greenorange.promotion.utils.SendSmsUtil; import com.greenorange.promotion.utils.SqlUtils; import jakarta.annotation.Resource; +import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -138,7 +139,7 @@ public class UserInfoServiceImpl extends ServiceImpl LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(UserInfo::getUserAccount, userAccount).eq(UserInfo::getUserPassword, userPassword); UserInfo userInfo = this.getOne(lambdaQueryWrapper); - ThrowUtils.throwIf(userInfo == null, ErrorCode.OPERATION_ERROR, "用户不存在"); + ThrowUtils.throwIf(userInfo == null, ErrorCode.OPERATION_ERROR, "账号或密码错误"); String userRole = userInfo.getUserRole(); UserRoleEnum userRoleEnum = UserRoleEnum.getEnumByValue(userRole); @@ -392,7 +393,7 @@ public class UserInfoServiceImpl extends ServiceImpl .phoneNumber(advancementApply.getPhone()) .userAvatar(UserConstant.USER_DEFAULT_AVATAR) .userAccount(phoneNumber) - .userPassword(RandomUtil.randomString(12)) + .userPassword(RandomUtil.randomNumbers(6) + RandomStringUtils.random(3, true, false)) .invitationCode(RandomUtil.randomNumbers(6)) .userRole(UserConstant.STAFF_ROLE) .parentUserId(parentUserInfo.getId())