From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 ff20ef9..ba4403c 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
@@ -15,6 +15,7 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
@@ -114,6 +115,7 @@
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
mallMember.setSex(registerDto.getSex());
+ mallMember.setInsideWith(1);
mallMember.setBindPhone(registerDto.getAccount());
mallMember.setSkin("default");
@@ -163,7 +165,7 @@
MallMember mallMember = this.baseMapper.selectInfoByAccountAndPwd(loginDto.getAccount(), md5Pwd);
if (mallMember == null) {
- throw new FebsException("用户不存在或账号密码错误");
+ throw new FebsException("账号密码错误");
}
if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) {
@@ -193,10 +195,15 @@
return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
}
+ public static void main(String[] args) {
+ RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
+ System.out.println(rsa.encryptBase64("fc848b76904a45e3bed8b6912921f36b" + "_" + System.currentTimeMillis(), KeyType.PublicKey));;
+ }
+
@Override
public FebsResponse forgetPwd(ForgetPwdDto forgetPwdDto) {
- MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getPhone());
-// MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
+// MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getPhone());
+ MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
if (mallMember == null) {
throw new FebsException("账号不存在");
}
@@ -226,6 +233,12 @@
MallMember mallMember = this.baseMapper.selectById(id);
MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
+
+ mallMemberVo.setCanInvite(1);
+ if (MemberLevelEnum.ZERO_LEVEL.getType().equals(mallMemberVo.getLevel())) {
+ mallMemberVo.setInviteId(null);
+ mallMemberVo.setCanInvite(2);
+ }
MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
if (referMember != null) {
@@ -635,7 +648,10 @@
@Override
public List<SkinTypeVo> findSkinList() {
MallMember loginUser = LoginUserUtil.getLoginUser();
- String level = loginUser.getLevel();
+
+ MallMember member = this.baseMapper.selectById(loginUser.getId());
+ String level = member.getLevel();
+
// 全网分红 -- 代理和股东当作是女王殿下级别
if (MemberLevelEnum.getLevelCode(level) > MemberLevelEnum.FOUR_LEVEL.getCode()) {
level = MemberLevelEnum.FOUR_LEVEL.getType();
--
Gitblit v1.9.1