From 68b94725a1f6cc69463d3537a0f7dc654b56cdf9 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 25 Apr 2023 22:52:27 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 844c1f9..f90c10c 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
@@ -468,7 +468,7 @@
canMoney = canMoney.subtract(profit);
}
}
- return canMoney;
+ return canMoney.compareTo(BigDecimal.ZERO) < 1 ? BigDecimal.ZERO : canMoney;
}
@Override
@@ -501,13 +501,10 @@
commissionVo.setAvatar(referMember.getAvatar());
}
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
- if (dic != null) {
- commissionVo.setLevelName(dic.getDescription());
- }
+ commissionVo.setLevelName(MemberLevelTagDicEnums.getDesc(mallMember.getSex(), mallMember.getLevel()));
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(id);
- commissionVo.setCommission(wallet.getBalance());
+ commissionVo.setCommission(wallet.getCommission());
commissionVo.setToday(mallMoneyFlowMapper.selectCommissionIncome(1, new Date(), id));
commissionVo.setMonth(mallMoneyFlowMapper.selectCommissionIncome(2, new Date(), id));
commissionVo.setTotal(mallMoneyFlowMapper.selectCommissionIncome(null, null, id));
@@ -645,7 +642,12 @@
@Override
public List<SkinTypeVo> findSkinList() {
MallMember loginUser = LoginUserUtil.getLoginUser();
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.SKIN_TYPE_LIST, loginUser.getLevel());
+ String level = loginUser.getLevel();
+ // 全网分红 -- 代理和股东当作是女王殿下级别
+ if (MemberLevelEnum.getLevelCode(level) > MemberLevelEnum.FOUR_LEVEL.getCode()) {
+ level = MemberLevelEnum.FOUR_LEVEL.getType();
+ }
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.SKIN_TYPE_LIST, level);
if (dic == null || StrUtil.isBlank(dic.getValue())) {
throw new FebsException("请检查皮肤配置");
}
--
Gitblit v1.9.1