admin/qingcheng-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复禅道bug

Browse Source
This commit is contained in:
chen-xin-zhi
2025-08-07 23:42:44 +08:00
parent f699b49c0f
commit 62ce63249c
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java
View File

@ -72,6 +72,15 @@ public class AdvancementApplyController {
String verificationCode = advancementApplyAddRequest.getVerificationCode(); String verificationCode = advancementApplyAddRequest.getVerificationCode();
// 校验用户手机号和验证码 // 校验用户手机号和验证码
userInfoService.checkPhoneAndVerificationCode(phone, verificationCode, UserRoleEnum.STAFF); userInfoService.checkPhoneAndVerificationCode(phone, verificationCode, UserRoleEnum.STAFF);
// 校验当前身份证号是否申请过
String idCard = advancementApplyAddRequest.getIdCard();
LambdaQueryWrapper<AdvancementApply> 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<AdvancementApply> applies = advancementApplyService.list(queryWrapper);
ThrowUtils.throwIf(!applies.isEmpty(), ErrorCode.OPERATION_ERROR, "当前手机号或身份证号已申请过");
AdvancementApply advancementApply = commonService.copyProperties(advancementApplyAddRequest, AdvancementApply.class); AdvancementApply advancementApply = commonService.copyProperties(advancementApplyAddRequest, AdvancementApply.class);
advancementApplyService.save(advancementApply); advancementApplyService.save(advancementApply);
return ResultUtils.success(advancementApply.getId()); return ResultUtils.success(advancementApply.getId());

2
src/main/java/com/greenorange/promotion/service/userInfo/impl/AdvancementApplyServiceImpl.java
View File

@ -31,7 +31,7 @@ public class AdvancementApplyServiceImpl extends ServiceImpl<AdvancementApplyMap
String sortField = advancementApplyQueryRequest.getSortField(); String sortField = advancementApplyQueryRequest.getSortField();
String sortOrder = advancementApplyQueryRequest.getSortOrder(); String sortOrder = advancementApplyQueryRequest.getSortOrder();
QueryWrapper<AdvancementApply> queryWrapper = new QueryWrapper<>(); QueryWrapper<AdvancementApply> 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(phone), "phone", phone);
queryWrapper.eq(StringUtils.isNotBlank(reviewStatus), "reviewStatus", reviewStatus); queryWrapper.eq(StringUtils.isNotBlank(reviewStatus), "reviewStatus", reviewStatus);
queryWrapper.orderBy(SqlUtils.validSortField(sortField), sortOrder.equals(CommonConstant.SORT_ORDER_DESC), sortField); queryWrapper.orderBy(SqlUtils.validSortField(sortField), sortOrder.equals(CommonConstant.SORT_ORDER_DESC), sortField);

5
src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java
View File

@ -32,6 +32,7 @@ import com.greenorange.promotion.utils.RegexUtils;
import com.greenorange.promotion.utils.SendSmsUtil; import com.greenorange.promotion.utils.SendSmsUtil;
import com.greenorange.promotion.utils.SqlUtils; import com.greenorange.promotion.utils.SqlUtils;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -138,7 +139,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(UserInfo::getUserAccount, userAccount).eq(UserInfo::getUserPassword, userPassword); lambdaQueryWrapper.eq(UserInfo::getUserAccount, userAccount).eq(UserInfo::getUserPassword, userPassword);
UserInfo userInfo = this.getOne(lambdaQueryWrapper); UserInfo userInfo = this.getOne(lambdaQueryWrapper);
ThrowUtils.throwIf(userInfo == null, ErrorCode.OPERATION_ERROR, "用户不存在"); ThrowUtils.throwIf(userInfo == null, ErrorCode.OPERATION_ERROR, "账号或密码错误");
String userRole = userInfo.getUserRole(); String userRole = userInfo.getUserRole();
UserRoleEnum userRoleEnum = UserRoleEnum.getEnumByValue(userRole); UserRoleEnum userRoleEnum = UserRoleEnum.getEnumByValue(userRole);
@ -392,7 +393,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
.phoneNumber(advancementApply.getPhone()) .phoneNumber(advancementApply.getPhone())
.userAvatar(UserConstant.USER_DEFAULT_AVATAR) .userAvatar(UserConstant.USER_DEFAULT_AVATAR)
.userAccount(phoneNumber) .userAccount(phoneNumber)
.userPassword(RandomUtil.randomString(12)) .userPassword(RandomUtil.randomNumbers(6) + RandomStringUtils.random(3, true, false))
.invitationCode(RandomUtil.randomNumbers(6)) .invitationCode(RandomUtil.randomNumbers(6))
.userRole(UserConstant.STAFF_ROLE) .userRole(UserConstant.STAFF_ROLE)
.parentUserId(parentUserInfo.getId()) .parentUserId(parentUserInfo.getId())