angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 因手机号可以重复，登录时只能使用账号进行登录；

This commit is contained in:
cabbage 2025-06-09 10:37:44 +08:00
parent 34e86d1835
commit 153a3fd24b
2 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
bd-business/bd-business-member/src/main/java/com/hzs/retail/login/service/impl/RetailMemberLoginServiceImpl.java
View File

@ -1,10 +1,7 @@
package com.hzs.retail.login.service.impl;
import cn.hutool.core.codec.Base64Decoder;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Validator;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.hzs.common.core.constant.SysConstants;
import com.hzs.common.core.constant.msg.SystemMsgConstants;
import com.hzs.common.core.enums.EAccountStatus;
import com.hzs.common.core.enums.ECategory;
@ -30,7 +27,6 @@ import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
/**
* 新零售会员登录服务
@ -52,27 +48,27 @@ public class RetailMemberLoginServiceImpl implements IRetailMemberLoginService {
throw new ServiceException("会员账号或联系方式必须填写");
}
CuMemberExt member;
CuMemberExt member = iCuMemberService.getRetailMemberByCode(userName);
if (userName.startsWith(SysConstants.RETAIL_PREFIX)) {
// 会员编号登录
member = iCuMemberService.getRetailMemberByCode(userName);
} else if ((userName.length() == 11 && userName.startsWith("1"))
|| Validator.isEmail(userName)) {
// 手机号 或 邮箱 登录
List<CuMemberExt> memberList = iCuMemberService.listMemberByPhone(userName);
if (CollectionUtil.isEmpty(memberList)) {
throw new ServiceException("会员账号或联系方式填写有误，请检查后重试");
}
if (memberList.size() > 1) {
// 联系方式超过两个，只能使用会员编号进行登录
throw new ServiceException("当前会员需要使用会员编号进行登录");
}
member = memberList.get(0);
} else {
// 用户/密码必须填写
throw new ServiceException("会员账号或联系方式填写有误，请检查后重试");
}
// if (userName.startsWith(SysConstants.RETAIL_PREFIX)) {
// // 会员编号登录
// member = iCuMemberService.getRetailMemberByCode(userName);
// } else if ((userName.length() == 11 && userName.startsWith("1"))
// || Validator.isEmail(userName)) {
// // 手机号 或 邮箱 登录
// List<CuMemberExt> memberList = iCuMemberService.listMemberByPhone(userName);
// if (CollectionUtil.isEmpty(memberList)) {
// throw new ServiceException("会员账号或联系方式填写有误，请检查后重试");
// }
// if (memberList.size() > 1) {
// // 联系方式超过两个，只能使用会员编号进行登录
// throw new ServiceException("当前会员需要使用会员编号进行登录");
// }
// member = memberList.get(0);
// } else {
// // 用户/密码必须填写
// throw new ServiceException("会员账号或联系方式填写有误，请检查后重试");
// }
if (null == member) {
recordLoginLog(null, EStatus.NO, userName + " 登录会员不存在");
@ -122,20 +118,20 @@ public class RetailMemberLoginServiceImpl implements IRetailMemberLoginService {
updateFlag = true;
}
}
if (null == member.getPkTeamCode()) {
// 空单注册会员，如果团队为空处理
CuMemberExt teamMember = iCuMemberService.queryParentTeam(member.getPkId());
if (null != teamMember) {
updateWrapper.set(CuMember::getPkTeamCode, teamMember.getPkTeamCode());
updateFlag = true;
}
}
// if (null == member.getPkTeamCode()) {
// // 空单注册会员，如果团队为空处理
// CuMemberExt teamMember = iCuMemberService.queryParentTeam(member.getPkId());
// if (null != teamMember) {
// updateWrapper.set(CuMember::getPkTeamCode, teamMember.getPkTeamCode());
// updateFlag = true;
// }
// }
if (updateFlag) {
updateWrapper.eq(CuMember::getPkId, member.getPkId());
iCuMemberService.update(updateWrapper);
}
} catch (Exception e) {
log.error("会员 {} 补全【体系】或【团队】错误", member.getMemberCode());
log.error("会员 {} 补全【体系】错误", member.getMemberCode());
}
recordLoginLog(loginMember.getPkId(), EStatus.YES, "登录成功");

2
bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/MemberTokenService.java
View File

@ -22,8 +22,6 @@ import java.util.concurrent.TimeUnit;
/**
* token验证处理
*
* @author hzs
*/
@Slf4j
@Component