From a73c78a32ea3bc77940af134904f451830c57139 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 23 Sep 2021 18:32:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 596af96..922c5e6 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
@@ -119,7 +119,7 @@
break;
}
parentId = parentMember.getReferrerId();
- if (parentMember.getReferrerId().equals(parentMember.getInviteId())) {
+ if (StrUtil.isBlank(parentMember.getReferrerId())) {
flag = true;
}
}
@@ -206,6 +206,9 @@
MallMember mallMember = this.baseMapper.selectById(id);
MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
+
+ MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
+ mallMemberVo.setBalance(wallet.getBalance());
return new FebsResponse().success().data(mallMemberVo);
}
--
Gitblit v1.9.1