From 9ccc8ed81210b5c4fdc50e71af201c6741622b84 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 16 Nov 2023 14:59:20 +0800
Subject: [PATCH] 登录、注册、忘记密码、修改登录密码、修改资金密码
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 172 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 116 insertions(+), 56 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 7e11deb..230a6e7 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
@@ -1,10 +1,7 @@
package cc.mrbird.febs.mall.service.impl;
import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
-import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
-import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.*;
import cc.mrbird.febs.mall.conversion.MallGoodsConversion;
@@ -39,6 +36,7 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author wzy
@@ -50,6 +48,7 @@
public class ApiMallMemberServiceImpl extends ServiceImpl<MallMemberMapper, MallMember> implements IApiMallMemberService {
private final MallMemberWalletMapper mallMemberWalletMapper;
+ private final MallMemberAmountMapper mallMemberAmountMapper;
private final ICommonService commonService;
private final RedisUtils redisUtils;
private final MallOrderInfoMapper mallOrderInfoMapper;
@@ -69,37 +68,27 @@
@Transactional(rollbackFor = Exception.class)
@Override
public FebsResponse register(RegisterDto registerDto) {
- MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
+ /**
+ * 验证账户密钥是否重复
+ * 验证邀请码是否存在
+ * 生成用户信息
+ * 返回账号和密钥给前端
+ */
+ String accountLogin = registerDto.getAccountLogin();
+ MallMember mallMember = this.baseMapper.selectByAccountLogin(accountLogin);
if (mallMember != null) {
- throw new FebsException("该账号已被占用");
+ 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();
- if (!"admin".equals(registerDto.getRegistType())) {
- String code = registerDto.getCode();
- boolean flags = commonService.verifyCode(account, code);
- if (!flags) {
- throw new FebsException("验证码错误");
- }
+ String userKey = registerDto.getUserKey();
+ MallMember mallMemberKey = this.baseMapper.selectByUserKey(userKey);
+ if (mallMemberKey != null) {
+ throw new FebsException("账号已使用，请重新注册。");
}
mallMember = new MallMember();
+ mallMember.setAccountLogin(accountLogin);
mallMember.setPassword(SecureUtil.md5(registerDto.getPassword()));
-
- // 判断账号类型
- if (AppContants.ACCOUNT_TYPE_MOBILE.equals(registerDto.getType())) {
- mallMember.setPhone(registerDto.getAccount());
- } else {
- mallMember.setEmail(registerDto.getAccount());
- }
+ mallMember.setTradePassword(SecureUtil.md5(registerDto.getTradePassword()));
Integer count = this.baseMapper.selectCount(null);
if (count != null && count != 0) {
@@ -107,20 +96,19 @@
if (inviteMember == null) {
throw new FebsException("邀请码不存在");
}
-
mallMember.setReferrerId(registerDto.getInviteId());
-
}
- mallMember.setName(registerDto.getName());
- mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
+// mallMember.setName(registerDto.getName());
+// mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
+ mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED);
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
- mallMember.setSex("男");
- mallMember.setBindPhone(registerDto.getAccount());
+// mallMember.setSex("男");
+// mallMember.setBindPhone(registerDto.getAccount());
this.baseMapper.insert(mallMember);
- String inviteId = ShareCodeUtil.toSerialCode(mallMember.getId());
+ String inviteId = ShareCodeUtil.toSerialNumberCodeTwo(mallMember.getId());
mallMember.setInviteId(inviteId);
//推荐人和推荐人链
@@ -152,9 +140,11 @@
this.baseMapper.updateById(mallMember);
MallMemberWallet wallet = new MallMemberWallet();
- wallet.setBalance(BigDecimal.ZERO);
wallet.setMemberId(mallMember.getId());
mallMemberWalletMapper.insert(wallet);
+ MallMemberAmount mallMemberAmount = new MallMemberAmount();
+ mallMemberAmount.setMemberId(mallMember.getId());
+ mallMemberAmountMapper.insert(mallMemberAmount);
return new FebsResponse().success().message("注册成功");
}
@@ -162,13 +152,12 @@
public FebsResponse toLogin(LoginDto loginDto) {
String md5Pwd = SecureUtil.md5(loginDto.getPassword());
- MallMember mallMember = this.baseMapper.selectInfoByAccountAndPwd(loginDto.getAccount(), md5Pwd);
+ MallMember mallMember = this.baseMapper.selectInfoByAccountLoginAndPwd(loginDto.getAccount(), md5Pwd);
if (mallMember == null) {
- throw new FebsException("用户不存在或账号密码错误");
+ throw new FebsException("账号或密码错误");
}
-
if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) {
- throw new FebsException("该账号存在异常, 暂限制登录");
+ throw new FebsException("账号限制登录");
}
String redisKey = AppContants.APP_LOGIN_PREFIX + mallMember.getId();
@@ -196,21 +185,22 @@
@Override
public FebsResponse forgetPwd(ForgetPwdDto forgetPwdDto) {
- MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getPhone());
-// MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
+ /**
+ * 验证用户名和密钥是否存在、是否匹配
+ * 更新用户密码
+ */
+ String accountLogin = forgetPwdDto.getAccountLogin();
+ String userKey = forgetPwdDto.getUserKey();
+ MallMember mallMember = this.baseMapper.selectAccountLoginAndUserKey(accountLogin,userKey);
if (mallMember == null) {
- throw new FebsException("账号不存在");
- }
-
- boolean b = commonService.verifyCode(forgetPwdDto.getAccount(), forgetPwdDto.getCode());
- if (!b) {
- throw new FebsException("验证码错误");
+ throw new FebsException("请输入正确的账号或密钥");
}
String pwd = SecureUtil.md5(forgetPwdDto.getPassword());
mallMember.setPassword(pwd);
-
this.baseMapper.updateById(mallMember);
+
+ redisUtils.del(AppContants.APP_LOGIN_PREFIX + mallMember.getId());
return new FebsResponse().success().message("重置成功");
}
@@ -252,6 +242,7 @@
mallMemberVo.setPrizeScore(wallet.getPrizeScore());
mallMemberVo.setTotalScore(wallet.getTotalScore());
mallMemberVo.setStar(wallet.getStar());
+ mallMemberVo.setVoucherCnt(wallet.getVoucherCnt());
mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
return new FebsResponse().success().data(mallMemberVo);
}
@@ -277,17 +268,15 @@
@Override
public FebsResponse setTradePwd(ForgetPwdDto forgetPwdDto) {
- MallMember memberId = LoginUserUtil.getLoginUser();
+ Long memberId = LoginUserUtil.getLoginUser().getId();
MallMember mallMember = this.baseMapper.selectById(memberId);
if (mallMember == null) {
throw new FebsException("账号不存在");
}
-
- boolean b = commonService.verifyCode(forgetPwdDto.getAccount(), forgetPwdDto.getCode());
- if (!b) {
- throw new FebsException("验证码错误");
+ MallMember mallMemberKey = this.baseMapper.selectByUserKey(forgetPwdDto.getUserKey());
+ if (!(mallMemberKey.getId() == memberId)) {
+ throw new FebsException("请输入正确的密钥");
}
-
mallMember.setTradePassword(SecureUtil.md5(forgetPwdDto.getPassword()));
this.baseMapper.updateById(mallMember);
return new FebsResponse().success().message("设置成功");
@@ -365,6 +354,10 @@
MallMember mallMember = this.baseMapper.selectInfoByAccount(transferDto.getAccount());
if (mallMember == null) {
throw new FebsException("用户不存在");
+ }
+ Integer insideWith = mallMember.getInsideWith() == null ? 2 :mallMember.getInsideWith();
+ if (1 != insideWith) {
+ throw new FebsException("功能升级中");
}
Long memberId = LoginUserUtil.getLoginUser().getId();
@@ -559,6 +552,17 @@
if (dic != null) {
cashOutSettingVo = JSONObject.parseObject(dic.getValue(), CashOutSettingVo.class);
}
+ DataDictionaryCustom voucherOnOffDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ GreenScoreEnum.VOUCHER_ON_OFF.getType(), GreenScoreEnum.VOUCHER_ON_OFF.getCode());
+ if(ObjectUtil.isNotEmpty(voucherOnOffDic)){
+ cashOutSettingVo.setVoucherOnOff(voucherOnOffDic.getValue());
+ DataDictionaryCustom voucherPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ GreenScoreEnum.VOUCHER_PERCENT.getType(), GreenScoreEnum.VOUCHER_PERCENT.getCode());
+ if(ObjectUtil.isNotEmpty(voucherPercentDic)){
+ cashOutSettingVo.setVoucherPercent(new BigDecimal(voucherPercentDic.getValue()));
+ }
+ }
+
return cashOutSettingVo;
}
@@ -614,6 +618,11 @@
mallMemberBank.setBankNo(updateMemberBankDto.getBankNo());
mallMemberBank.setPhone(updateMemberBankDto.getPhone());
mallMemberBank.setDigitalNo(updateMemberBankDto.getDigitalNo());
+ mallMemberBank.setBankName(updateMemberBankDto.getBankName());
+ mallMemberBank.setSubbranchName(updateMemberBankDto.getSubbranchName());
+ mallMemberBank.setProvince(updateMemberBankDto.getProvince());
+ mallMemberBank.setCity(updateMemberBankDto.getCity());
+ mallMemberBank.setSkhh(updateMemberBankDto.getSkhh());
mallMemberBankMapper.updateById(mallMemberBank);
return new FebsResponse().success();
}
@@ -624,4 +633,55 @@
mallMemberBankMapper.deleteById(id);
return new FebsResponse().success();
}
+
+ @Override
+ public FebsResponse findBankName() {
+ List<String> bankNameList = new ArrayList<>();
+ List<DataDictionaryCustom> typeBank = dataDictionaryCustomMapper.selectDicByType("TYPE_BANK");
+ if(CollUtil.isNotEmpty(typeBank)){
+ bankNameList = typeBank.stream().map(DataDictionaryCustom::getValue).collect(Collectors.toList());
+ }
+ return new FebsResponse().success().data(bankNameList);
+ }
+
+ @Override
+ public FebsResponse pwdForget(ForgetPwdDto forgetPwdDto) {
+ String accountLogin = forgetPwdDto.getAccountLogin();
+ String userKey = forgetPwdDto.getUserKey();
+ MallMember mallMember = this.baseMapper.selectAccountLoginAndUserKey(accountLogin,userKey);
+ if(ObjectUtil.isEmpty(mallMember)){
+ throw new FebsException("账号不存在");
+ }
+ String pwd = SecureUtil.md5(forgetPwdDto.getPassword());
+ mallMember.setPassword(pwd);
+ this.baseMapper.updateById(mallMember);
+ return new FebsResponse().success().message("重置成功");
+ }
+
+ @Override
+ public FebsResponse createAccount() {
+ Integer selectCount = this.baseMapper.selectCount(null);
+ String account = new StringBuilder().append("bbsz").append(ShareCodeUtil.toSerialNumberCode(selectCount)).toString();
+ return new FebsResponse().success().data(account);
+ }
+
+ @Override
+ public FebsResponse createKey() {
+ Integer selectCount = this.baseMapper.selectCount(null);
+ String key = ShareCodeUtil.toSerialCode(selectCount);
+ return new FebsResponse().success().data(key);
+ }
+
+ public static void main(String[] args) {
+ Set<String> objectsAccount = new HashSet<>();
+ Set<String> objects = new HashSet<>();
+ int j = 100;
+ for(int i =0;i < 100 ; i++){
+ String s = ShareCodeUtil.toSerialNumberCodeTwo(j);
+ objects.add(s);
+ }
+
+ System.out.println(objects);
+ System.out.println(objects.size());
+ }
}
--
Gitblit v1.9.1