From 602c28c45cfec4d800ca9bb9da969cbfa9094971 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 04 Jun 2023 12:30:44 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

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 da1331a..783f2c1 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
@@ -116,7 +116,6 @@
         mallMember.setSex(registerDto.getSex());
         mallMember.setBindPhone(registerDto.getAccount());
         mallMember.setSkin("default");
-        mallMember.setCardNo(registerDto.getCardNo());
 
         this.baseMapper.insert(mallMember);
 
@@ -164,7 +163,7 @@
 
         MallMember mallMember = this.baseMapper.selectInfoByAccountAndPwd(loginDto.getAccount(), md5Pwd);
         if (mallMember == null) {
-            throw new FebsException("用户不存在或账号密码错误");
+            throw new FebsException("账号密码错误");
         }
 
         if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) {
@@ -196,8 +195,8 @@
 
     @Override
     public FebsResponse forgetPwd(ForgetPwdDto forgetPwdDto) {
-        MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getPhone());
-//        MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
+//        MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getPhone());
+        MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
         if (mallMember == null) {
             throw new FebsException("账号不存在");
         }
@@ -636,7 +635,10 @@
     @Override
     public List<SkinTypeVo> findSkinList() {
         MallMember loginUser = LoginUserUtil.getLoginUser();
-        String level = loginUser.getLevel();
+
+        MallMember member = this.baseMapper.selectById(loginUser.getId());
+        String level = member.getLevel();
+
         // 全网分红 -- 代理和股东当作是女王殿下级别
         if (MemberLevelEnum.getLevelCode(level) > MemberLevelEnum.FOUR_LEVEL.getCode()) {
             level = MemberLevelEnum.FOUR_LEVEL.getType();

--
Gitblit v1.9.1