From 076f5a4f0a7c5a4d3a6d3a1a61ff96a0091e3320 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 06 May 2023 15:04:21 +0800
Subject: [PATCH] 星级补贴逻辑修改
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 384cb75..f2855ed 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
@@ -67,18 +67,23 @@
@Transactional(rollbackFor = Exception.class)
@Override
public FebsResponse register(RegisterDto registerDto) {
- MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
+// MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
+// if (mallMember != null) {
+// throw new FebsException("该账号已被占用");
+// }
+ String accountLogin = registerDto.getAccountLogin();
+ MallMember mallMember = this.baseMapper.selectByAccountLogin(accountLogin);
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("用户名已存在");
- }
- }
+// 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();
if (!"admin".equals(registerDto.getRegistType())) {
@@ -90,6 +95,7 @@
}
mallMember = new MallMember();
+ mallMember.setAccountLogin(accountLogin);
mallMember.setPassword(SecureUtil.md5(registerDto.getPassword()));
// 判断账号类型
@@ -160,7 +166,8 @@
public FebsResponse toLogin(LoginDto loginDto) {
String md5Pwd = SecureUtil.md5(loginDto.getPassword());
- MallMember mallMember = this.baseMapper.selectInfoByAccountAndPwd(loginDto.getAccount(), md5Pwd);
+// MallMember mallMember = this.baseMapper.selectInfoByAccountAndPwd(loginDto.getAccount(), md5Pwd);
+ MallMember mallMember = this.baseMapper.selectInfoByAccountLoginAndPwd(loginDto.getAccount(), md5Pwd);
if (mallMember == null) {
throw new FebsException("用户不存在或账号密码错误");
}
--
Gitblit v1.9.1