From f5a898b9927c05179c213bf4e6a6f2310e097e74 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 18 May 2022 21:44:11 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 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 3792781..9001cfc 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;
@@ -57,6 +58,7 @@
private final MallMemberPaymentMapper mallMemberPaymentMapper;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallShopApplyMapper mallShopApplyMapper;
+ private final MallRegisterAppealMapper mallRegisterAppealMapper;
@Value("${spring.profiles.active}")
@@ -68,6 +70,14 @@
MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
if (mallMember != null) {
throw new FebsException("该账号已被占用");
+ }
+
+ List<MallMember> mallMembers = this.baseMapper.selectMemberByName(registerDto.getName());
+ if (CollUtil.isNotEmpty(mallMembers)) {
+ MallRegisterAppeal registerAppeal = mallRegisterAppealMapper.selectByPhoneAndName(registerDto.getName(), registerDto.getAccount());
+ if (registerAppeal == null || registerAppeal.getStatus() != 1) {
+ return new FebsResponse().code(HttpStatus.ACCEPTED).message("用户名已存在");
+ }
}
String account = registerDto.getAccount();
@@ -97,7 +107,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());
@@ -503,4 +513,19 @@
return mallShopApplyMapper.selectNewestApplyByMemberId(member.getId());
}
+
+ @Override
+ public void addRegisterAppeal(RegisterAppealDto registerAppeal) {
+ MallRegisterAppeal isExist = mallRegisterAppealMapper.selectByPhoneAndName(registerAppeal.getName(), registerAppeal.getPhone());
+ if (isExist != null) {
+ throw new FebsException("申诉已存在");
+ }
+
+ isExist = new MallRegisterAppeal();
+ isExist.setName(registerAppeal.getName());
+ isExist.setPhone(registerAppeal.getPhone());
+ isExist.setStatus(2);
+
+ mallRegisterAppealMapper.insert(isExist);
+ }
}
--
Gitblit v1.9.1