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 |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 1cf70c4..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();
@@ -167,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);
     }
 
@@ -349,6 +347,10 @@
         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