From 1703998e437fe9054ebbe681b2b3013c83bb8a2b Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 12 Jun 2023 23:01:13 +0800
Subject: [PATCH] 修改
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 3 +++
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 11 +++++++++++
3 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index 58d2977..fb9fc50 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -615,7 +615,7 @@
member.setReferrerIds(refererIds);
this.baseMapper.updateById(member);
- List<MallMember> childs = this.baseMapper.selectByRefererId(member.getInviteId());
+ List<MallMember> childs = this.baseMapper.selectAllChildAgentListByInviteId(member.getInviteId());
if (CollUtil.isEmpty(childs)) {
return;
}
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 ff1222a..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
@@ -195,6 +195,11 @@
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());
@@ -229,6 +234,12 @@
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) {
mallMemberVo.setReferrerName(referMember.getName());
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index 926df29..5d52e27 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -97,6 +97,9 @@
@ApiModelProperty(value = "内转标识 1：开启 2：关闭")
private Integer insideWith;
+ @ApiModelProperty(value = "是否可以邀请")
+ private Integer canInvite;
+
public String getLevelName() {
if (sex != null) {
return MemberLevelTagDicEnums.getDesc(sex, level);
--
Gitblit v1.9.1