From 0a41407a35c47cba38c75f13eae69ebd49c0dfac Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 28 Sep 2021 17:29:28 +0800 Subject: [PATCH] fix agent auto level up --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 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 1fadbdf..aa7be61 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 @@ -64,7 +64,7 @@ public FebsResponse register(RegisterDto registerDto) { MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount()); if (mallMember != null) { - throw new FebsException("该手机号/邮箱已被占用"); + throw new FebsException("该账号已被占用"); } String account = registerDto.getAccount(); @@ -108,6 +108,9 @@ //推荐人和推荐人链 boolean flag = false; String parentId = mallMember.getReferrerId(); + if (StrUtil.isBlank(parentId)) { + flag = true; + } String ids = ""; while (!flag) { if (StrUtil.isBlank(ids)) { @@ -252,7 +255,8 @@ @Override public FebsResponse setTradePwd(ForgetPwdDto forgetPwdDto) { - MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount()); + MallMember memberId = LoginUserUtil.getLoginUser(); + MallMember mallMember = this.baseMapper.selectById(memberId); if (mallMember == null) { throw new FebsException("账号不存在"); } @@ -344,6 +348,11 @@ Long memberId = LoginUserUtil.getLoginUser().getId(); MallMember loginMember = this.baseMapper.selectById(memberId); + + if (loginMember.getPhone().equals(transferDto.getAccount()) || loginMember.getInviteId().equals(transferDto.getAccount())) { + throw new FebsException("不能给自己转账"); + } + if (StrUtil.isBlank(loginMember.getTradePassword())) { throw new FebsException("未设置支付密码"); } -- Gitblit v1.9.1