From 165a8e59626c0015386747b41ab9fee33943cd02 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 May 2023 10:52:34 +0800
Subject: [PATCH] 正式环境
---
src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java | 2 ++
src/main/resources/mapper/modules/MallMemberMapper.xml | 4 ++++
src/main/java/cc/mrbird/febs/mall/dto/ForgetPwdDto.java | 3 +++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 4 ++++
4 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ForgetPwdDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ForgetPwdDto.java
index 0796cdd..a07ec67 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/ForgetPwdDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ForgetPwdDto.java
@@ -15,6 +15,9 @@
@ApiModel(value = "ForgetPwdDto", description = "忘记/修改密码参数接收类")
public class ForgetPwdDto {
+ @ApiModelProperty(value = "登录账号", example = "15773001234")
+ private String accountLogin;
+
@NotBlank(message = "账号不能为空")
@ApiModelProperty(value = "账号", example = "15773001234")
private String phone;
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
index 492c3b6..3061839 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
@@ -23,6 +23,8 @@
MallMember selectInfoByAccount(@Param("account") String account);
+ MallMember selectInfoByAccountNew(@Param("account") String account,@Param("phone") String phone);
+
IPage<MallMember> selectMallMemberListInPage(Page<MallMember> page, @Param("record")MallMember mallMember);
MallMember selectInfoByInviteId(@Param("inviteId") String inviteId);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 04977b2..bfdf634 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -203,6 +203,10 @@
public FebsResponse forgetPwd(ForgetPwdDto forgetPwdDto) {
Long id = LoginUserUtil.getLoginUser().getId();
MallMember mallMember = this.baseMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallMember)){
+ mallMember = this.baseMapper.selectInfoByAccountNew(forgetPwdDto.getAccountLogin(),forgetPwdDto.getPhone());
+ }
+
// MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getPhone());
// MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
if (mallMember == null) {
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index d8f5692..44ea668 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -83,6 +83,10 @@
select * from mall_member where phone=#{account} or email=#{account} or invite_id=#{account}
</select>
+ <select id="selectInfoByAccountNew" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member where phone = #{phone} and account_login = #{account}
+ </select>
+
<select id="selectInfoByInviteId" resultType="cc.mrbird.febs.mall.entity.MallMember">
select * from mall_member where invite_id=#{inviteId}
</select>
--
Gitblit v1.9.1