From cf850c5d93b6b1dcfcd6da06faeb3ea7e093ad91 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Aug 2023 17:55:47 +0800
Subject: [PATCH] jufu商城
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 135 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 121 insertions(+), 14 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..355679b 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
@@ -59,6 +59,8 @@
private final MallShopApplyMapper mallShopApplyMapper;
private final MallRegisterAppealMapper mallRegisterAppealMapper;
private final MallMemberBankMapper mallMemberBankMapper;
+ private final MallMemberAlipayMapper mallMemberAlipayMapper;
+ private final MallMemberAuthMapper mallMemberAuthMapper;
@Value("${spring.profiles.active}")
@@ -67,18 +69,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 +97,7 @@
}
mallMember = new MallMember();
+ mallMember.setAccountLogin(accountLogin);
mallMember.setPassword(SecureUtil.md5(registerDto.getPassword()));
// 判断账号类型
@@ -160,7 +168,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("用户不存在或账号密码错误");
}
@@ -194,7 +203,10 @@
@Override
public FebsResponse forgetPwd(ForgetPwdDto forgetPwdDto) {
- MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getPhone());
+ Long id = LoginUserUtil.getLoginUser().getId();
+ MallMember mallMember = this.baseMapper.selectById(id);
+
+// MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getPhone());
// MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
if (mallMember == null) {
throw new FebsException("账号不存在");
@@ -225,10 +237,11 @@
MallMember mallMember = this.baseMapper.selectById(id);
MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
-
- MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
- if (referMember != null) {
- mallMemberVo.setReferrerName(referMember.getName());
+ if(ObjectUtil.isNotEmpty(mallMember.getReferrerId())){
+ MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
+ if (referMember != null) {
+ mallMemberVo.setReferrerName(referMember.getName());
+ }
}
if (StrUtil.isNotBlank(mallMember.getTradePassword())) {
@@ -653,4 +666,98 @@
}
return new FebsResponse().success().data(bankNameList);
}
+
+ @Override
+ public FebsResponse pwdForget(ForgetPwdDto forgetPwdDto) {
+ MallMember mallMember = this.baseMapper.selectInfoByAccountNew(forgetPwdDto.getAccountLogin(),forgetPwdDto.getPhone());
+ if(ObjectUtil.isEmpty(mallMember)){
+ throw new FebsException("账号不存在");
+ }
+
+ boolean b = commonService.verifyCode(forgetPwdDto.getAccount(), forgetPwdDto.getCode());
+ if (!b) {
+ throw new FebsException("验证码错误");
+ }
+
+ String pwd = SecureUtil.md5(forgetPwdDto.getPassword());
+ mallMember.setPassword(pwd);
+
+ this.baseMapper.updateById(mallMember);
+ return new FebsResponse().success().message("重置成功");
+ }
+
+ @Override
+ public FebsResponse addMemberAli(AddMemberAliDto addMemberAliDto) {
+ MallMember member = LoginUserUtil.getLoginUser();
+ MallMemberAlipay mallMemberAlipay = new MallMemberAlipay();
+ mallMemberAlipay.setMemberId(member.getId());
+ mallMemberAlipay.setName(addMemberAliDto.getName());
+ mallMemberAlipay.setAliNum(addMemberAliDto.getAliNum());
+ mallMemberAlipay.setAliPic(addMemberAliDto.getAliPic());
+ mallMemberAlipayMapper.insert(mallMemberAlipay);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse delMemberAli(Long id) {
+ mallMemberAlipayMapper.deleteById(id);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse memberAliDetails(Long id) {
+ MemberAliVo memberAliVo = new MemberAliVo();
+ MallMemberAlipay mallMemberAlipay = mallMemberAlipayMapper.selectById(id);
+ memberAliVo.setId(mallMemberAlipay.getId());
+ memberAliVo.setName(mallMemberAlipay.getName());
+ memberAliVo.setAliNum(mallMemberAlipay.getAliNum());
+ memberAliVo.setAliPic(mallMemberAlipay.getAliPic());
+ return new FebsResponse().success().data(memberAliVo);
+ }
+
+ @Override
+ public FebsResponse updateMemberAli(UpdateMemberAliDto updateMemberAliDto) {
+
+ MallMemberAlipay mallMemberAlipay = mallMemberAlipayMapper.selectById(updateMemberAliDto.getId());
+ mallMemberAlipay.setName(updateMemberAliDto.getName());
+ mallMemberAlipay.setAliNum(updateMemberAliDto.getAliNum());
+ mallMemberAlipay.setAliPic(updateMemberAliDto.getAliPic());
+ mallMemberAlipayMapper.updateById(mallMemberAlipay);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse memberAliList(MemberAliListDto memberAliListDto) {
+ MallMember member = LoginUserUtil.getLoginUser();
+ Page<MemberAliVo> page = new Page<>(memberAliListDto.getPageNum(), memberAliListDto.getPageSize());
+ memberAliListDto.setMemberId(member.getId());
+ IPage<MemberAliVo> pageResult = mallMemberAlipayMapper.memberAliListInPage(memberAliListDto, page);
+ return new FebsResponse().success().data(pageResult);
+ }
+
+ @Override
+ public FebsResponse memberAuth(MemberAuthDto memberAuthDto) {
+ MallMember member = LoginUserUtil.getLoginUser();
+ List<MallMemberAuth> mallMemberAuthYes = mallMemberAuthMapper.selectByMemberIdAndStatus(member.getId(),2);
+ if(ObjectUtil.isNotEmpty(mallMemberAuthYes)){
+ throw new FebsException("已实名认证");
+ }
+ List<MallMemberAuth> mallMemberAuthIng = mallMemberAuthMapper.selectByMemberIdAndStatus(member.getId(),1);
+ if(ObjectUtil.isNotEmpty(mallMemberAuthIng)){
+ throw new FebsException("正在实名认证中");
+ }
+
+ MallMemberAuth mallMemberAuth = new MallMemberAuth();
+ mallMemberAuth.setName(memberAuthDto.getName());
+ mallMemberAuth.setCardNum(memberAuthDto.getCardNum());
+ mallMemberAuth.setCardFront(memberAuthDto.getCardFront());
+ mallMemberAuth.setCardBack(memberAuthDto.getCardBack());
+ mallMemberAuth.setStatus(2);
+ mallMemberAuthMapper.insert(mallMemberAuth);
+
+ MallMember mallMember = this.baseMapper.selectById(member.getId());
+ mallMember.setIsAuth(1);
+ this.baseMapper.updateById(mallMember);
+ return new FebsResponse().success();
+ }
}
--
Gitblit v1.9.1