From aeb03e037cd734d7a636ab407c02f9ec9cef87c2 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Tue, 2 Sep 2025 14:24:44 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E7=99=BB=E5=BD=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../retail/login/param/RetailLoginParam.java  |  6 +--
 .../impl/RetailMemberLoginServiceImpl.java    | 42 ++++++++++---------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/login/param/RetailLoginParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/login/param/RetailLoginParam.java
index 28f04f5b..ce7e00ad 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/login/param/RetailLoginParam.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/login/param/RetailLoginParam.java
@@ -7,11 +7,7 @@ import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
- * @Description: 新零售登录入参
- * @Author: jiang chao
- * @Time: 2024/12/11 14:15
- * @Classname: RetailMemberLogin
- * @PackageName: com.hzs.retail.login.param
+ * 新零售登录入参
  */
 @Data
 public class RetailLoginParam implements Serializable {
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 3ff6b665..399835ca 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,7 +1,9 @@
 package com.hzs.retail.login.service.impl;
 
 import cn.hutool.core.codec.Base64Decoder;
+import cn.hutool.core.collection.CollectionUtil;
 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;
@@ -27,6 +29,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 新零售会员登录服务
@@ -48,27 +51,26 @@ public class RetailMemberLoginServiceImpl implements IRetailMemberLoginService {
             throw new ServiceException("会员账号或联系方式必须填写");
         }
 
-        CuMemberExt member = iCuMemberService.getRetailMemberByCode(userName);
+        CuMemberExt member;
 
-//        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.length() == 11 && userName.startsWith("1")) {
+            // 手机号 登录
+            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 if (userName.startsWith(SysConstants.RETAIL_PREFIX)) {
+            // 会员编号登录
+            member = iCuMemberService.getRetailMemberByCode(userName);
+        } else {
+            // 用户/密码必须填写
+            throw new ServiceException("会员账号或联系方式填写有误，请检查后重试");
+        }
 
         if (null == member) {
             recordLoginLog(null, EStatus.NO, userName + " 登录会员不存在");