From 45a4599ccc31fafacc9bb799d98d3bd7b7be2b18 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 9 Jun 2025 10:37:44 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=9B=A0=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=87=8D=E5=A4=8D=EF=BC=8C=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=B6=E5=8F=AA=E8=83=BD=E4=BD=BF=E7=94=A8=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E7=99=BB=E5=BD=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RetailMemberLoginServiceImpl.java | 62 +++++++++---------- .../security/service/MemberTokenService.java | 2 - 2 files changed, 29 insertions(+), 35 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/login/service/impl/RetailMemberLoginServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/login/service/impl/RetailMemberLoginServiceImpl.java index bfdc4d37..3ff6b665 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/login/service/impl/RetailMemberLoginServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/login/service/impl/RetailMemberLoginServiceImpl.java @@ -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 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 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, "登录成功"); diff --git a/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/MemberTokenService.java b/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/MemberTokenService.java index fcccfae2..62297b45 100644 --- a/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/MemberTokenService.java +++ b/bd-common/bd-common-security/src/main/java/com/hzs/common/security/service/MemberTokenService.java @@ -22,8 +22,6 @@ import java.util.concurrent.TimeUnit; /** * token验证处理 - * - * @author hzs */ @Slf4j @Component