From 2eff39a10917e141d2a61ff9f0763c10858cd0b5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 28 Sep 2021 21:07:07 +0800
Subject: [PATCH] 20210928
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 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 3799ce2..c14b4a8 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();
@@ -97,7 +97,7 @@
mallMember.setName(registerDto.getAccount());
mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
- mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+ mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.name());
mallMember.setSex("男");
this.baseMapper.insert(mallMember);
@@ -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)) {
@@ -164,9 +167,7 @@
redisUtils.set(redisKey, token, 360000);
Map<String, Object> authInfo = new HashMap<>();
authInfo.put("token", token);
- if ("dev".equals(active)) {
- authInfo.put("rasToken", generateAsaToken(token));
- }
+ authInfo.put("rasToken", generateAsaToken(token));
return new FebsResponse().success().data(authInfo);
}
@@ -252,7 +253,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 +346,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("未设置支付密码");
}
@@ -405,4 +412,18 @@
MallMember member = LoginUserUtil.getLoginUser();
return mallMemberPaymentMapper.selectByMemberId(member.getId());
}
+
+ @Override
+ public void bindPhone(AccountAndCodeDto accountAndCodeDto) {
+ boolean b = commonService.verifyCode(accountAndCodeDto.getAccount(), accountAndCodeDto.getCode());
+ if (!b) {
+ throw new FebsException("验证码错误");
+ }
+
+ Long id = LoginUserUtil.getLoginUser().getId();
+ MallMember member = this.baseMapper.selectById(id);
+
+ member.setBindPhone(accountAndCodeDto.getAccount());
+ this.baseMapper.updateById(member);
+ }
}
--
Gitblit v1.9.1