From dd0be2e72aeebcb86ce1fc6b89f86a291c5627d5 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Fri, 13 Jun 2025 16:35:29 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E6=89=8B=E6=9C=BA=E5=8F=B7=EF=BC=88?=
 =?UTF-8?q?182=EF=BC=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/api/ApiMemberController.java    | 13 +++++++++----
 .../hzs/member/base/param/ForgetPasswordParam.java  | 12 +++++++-----
 .../member/sms/controller/api/ApiSmsController.java | 11 +++--------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java
index 86d04ef3..87055001 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java
@@ -248,11 +248,16 @@ public class ApiMemberController extends BaseController {
         if (CollectionUtil.isEmpty(cuMemberList)) {
             return AjaxResult.error("会员联系方式不存在");
         }
-        if (cuMemberList.size() > 1) {
-            // 2025.02.19 添加需求，如果一个手机号查询出两个会员编号，需要提示联系客户进行修改
-            return AjaxResult.error("请联系客服进行操作");
+
+        CuMemberExt cuMemberExt = null;
+        for (CuMemberExt tmpMember : cuMemberList) {
+            if (tmpMember.getMemberCode().equals(param.getMemberCode())) {
+                cuMemberExt = tmpMember;
+            }
+        }
+        if (null == cuMemberExt) {
+            return AjaxResult.error("会员信息不存在");
         }
-        CuMemberExt cuMemberExt = cuMemberList.get(0);
         Long memberId = cuMemberExt.getPkId();
 
         // 校验短信验证码是否有效
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ForgetPasswordParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ForgetPasswordParam.java
index 34972a68..8e09a4a0 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ForgetPasswordParam.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/ForgetPasswordParam.java
@@ -7,15 +7,17 @@ import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
- * @Description: 忘记密码保存入参
- * @Author: jiang chao
- * @Time: 2024/12/25 14:33
- * @Classname: ForgetPasswordParam
- * @PackageName: com.hzs.member.base.param
+ * 忘记密码保存入参
  */
 @Data
 public class ForgetPasswordParam implements Serializable {
 
+    /**
+     * 会员编号
+     */
+    @NotEmpty(message = "会员编号不能为空")
+    private String memberCode;
+
     /**
      * 联系方式
      */
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/controller/api/ApiSmsController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/controller/api/ApiSmsController.java
index ed122260..647ecfd5 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/controller/api/ApiSmsController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/controller/api/ApiSmsController.java
@@ -43,22 +43,17 @@ public class ApiSmsController extends BaseController {
     /**
      * 忘记密码验证码
      *
-     * @param phone 手机号码
+     * @param memberCode 会员编号
+     * @param phone      手机号码
      * @return
      */
     @RepeatSubmitSimple
     @GetMapping("/forget-verification")
-    public AjaxResult forgetVerification(@RequestParam String phone) {
-        // 2024.12.25 一个手机号只能注册一个会员编号，找回密码只需要手机号（9035）
+    public AjaxResult forgetVerification(@RequestParam String memberCode, @RequestParam String phone) {
         List<CuMemberExt> cuMemberList = iCuMemberService.listMemberByPhone(phone);
         if (CollectionUtil.isEmpty(cuMemberList)) {
             return AjaxResult.error("会员联系方式不存在");
         }
-        if (cuMemberList.size() > 1) {
-            // 2025.02.19 添加需求，如果一个手机号查询出两个会员编号，需要提示联系客户进行修改
-            return AjaxResult.error("请联系客服进行操作");
-        }
-
         return toAjax(iApiCodeService.sendRecoverCode(phone));
     }