From d867207d4bf46378718927444c7cef404b4a6a03 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 15:19:50 +0800
Subject: [PATCH] 20210924

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 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 596af96..ca6e862 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
@@ -9,6 +9,7 @@
 import cc.mrbird.febs.mall.conversion.MallMemberConversion;
 import cc.mrbird.febs.mall.dto.ForgetPwdDto;
 import cc.mrbird.febs.mall.dto.LoginDto;
+import cc.mrbird.febs.mall.dto.ModifyMemberInfoDto;
 import cc.mrbird.febs.mall.dto.RegisterDto;
 import cc.mrbird.febs.mall.entity.MallMember;
 import cc.mrbird.febs.mall.entity.MallMemberWallet;
@@ -119,7 +120,7 @@
                 break;
             }
             parentId = parentMember.getReferrerId();
-            if (parentMember.getReferrerId().equals(parentMember.getInviteId())) {
+            if (StrUtil.isBlank(parentMember.getReferrerId())) {
                 flag = true;
             }
         }
@@ -206,6 +207,9 @@
         MallMember mallMember = this.baseMapper.selectById(id);
 
         MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
+
+        MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
+        mallMemberVo.setBalance(wallet.getBalance());
         return new FebsResponse().success().data(mallMemberVo);
     }
 
@@ -227,4 +231,37 @@
         result.put("carts", carts.size());
         return new FebsResponse().success().data(result);
     }
+
+    @Override
+    public FebsResponse setTradePwd(ForgetPwdDto forgetPwdDto) {
+        MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
+        if (mallMember == null) {
+            throw new FebsException("账号不存在");
+        }
+
+        boolean b = commonService.verifyCode(forgetPwdDto.getAccount(), forgetPwdDto.getCode());
+        if (!b) {
+            throw new FebsException("验证码错误");
+        }
+
+        mallMember.setTradePassword(SecureUtil.md5(forgetPwdDto.getPassword()));
+        this.baseMapper.updateById(mallMember);
+        return new FebsResponse().success().message("设置成功");
+    }
+
+    @Override
+    public FebsResponse modifyMemberInfo(ModifyMemberInfoDto modifyMemberInfoDto) {
+        MallMember member = LoginUserUtil.getLoginUser();
+        MallMember mallMember = this.baseMapper.selectById(member.getId());
+        if (StrUtil.isNotBlank(modifyMemberInfoDto.getName())) {
+            mallMember.setName(modifyMemberInfoDto.getName());
+        }
+
+        if (StrUtil.isNotBlank(modifyMemberInfoDto.getPhoto())) {
+            mallMember.setAvatar(modifyMemberInfoDto.getPhoto());
+        }
+
+        this.baseMapper.updateById(mallMember);
+        return new FebsResponse().success().message("修改成功");
+    }
 }

--
Gitblit v1.9.1