From 80d17668d4e1b96ac88301cf7d2f7b9a086c9d32 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 16 May 2022 14:36:51 +0800
Subject: [PATCH] fix register

---
 src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java               |    2 ++
 src/main/resources/mapper/modules/MallMemberMapper.xml                       |    5 +++++
 src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java                       |    4 ++++
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |    8 +++++++-
 4 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java b/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java
index a8ef6af..6ac2eab 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java
@@ -18,6 +18,10 @@
     @ApiModelProperty(value = "手机号", example = "15773001234")
     private String account;
 
+    @NotBlank(message = "姓名不能为空")
+    @ApiModelProperty(value = "姓名", example = "王大洋")
+    private String name;
+
     @NotBlank(message = "密码不能为空")
     @ApiModelProperty(value = "密码", example = "123456")
     private String password;
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
index 2a7731e..598055a 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
@@ -72,4 +72,6 @@
     IPage<MallDataVo> getMallDataListInPage(Page<MallDataVo> page,  @Param("record")MallMember mallMember);
 
     IPage<MallMember> selectRankListInPage(IPage<MallMember> page, @Param("record") MallMember mallMember);
+
+    List<MallMember> selectMemberByName(@Param("name") String name);
 }
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 3792781..94ee6ee 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
@@ -29,6 +29,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -70,6 +71,11 @@
             throw new FebsException("该账号已被占用");
         }
 
+        List<MallMember> mallMembers = this.baseMapper.selectMemberByName(registerDto.getName());
+        if (CollUtil.isNotEmpty(mallMembers)) {
+            return new FebsResponse().code(HttpStatus.ACCEPTED).message("用户名已存在");
+        }
+
         String account = registerDto.getAccount();
         String code = registerDto.getCode();
         boolean flags = commonService.verifyCode(account, code);
@@ -97,7 +103,7 @@
             mallMember.setReferrerId(registerDto.getInviteId());
 
         }
-        mallMember.setName(registerDto.getAccount());
+        mallMember.setName(registerDto.getName());
         mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
         mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
         mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 4484e3a..88e6019 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -324,4 +324,9 @@
           group by a.id
       ) a order by amount desc, a.orderTime desc
     </select>
+
+    <select id="selectMemberByName" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        select * from mall_member
+        where name=#{name}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1