From 296a4e53a387bbc6b70183e02787972934adc1b6 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 24 Apr 2023 20:44:09 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 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 2cb8174..517b3c8 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
@@ -36,6 +36,7 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author wzy
@@ -112,8 +113,9 @@
mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
- mallMember.setSex("男");
+ mallMember.setSex(registerDto.getSex());
mallMember.setBindPhone(registerDto.getAccount());
+ mallMember.setSkin("default");
this.baseMapper.insert(mallMember);
@@ -499,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));
@@ -639,4 +638,26 @@
mallMemberBankMapper.deleteById(id);
return new FebsResponse().success();
}
+
+ @Override
+ public List<SkinTypeVo> findSkinList() {
+ MallMember loginUser = LoginUserUtil.getLoginUser();
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.SKIN_TYPE_LIST, loginUser.getLevel());
+ if (dic == null || StrUtil.isBlank(dic.getValue())) {
+ throw new FebsException("请检查皮肤配置");
+ }
+
+ List<String> skipStrList = StrUtil.split(dic.getValue(), ';');
+ return skipStrList.stream().map(item -> JSONObject.parseObject(item, SkinTypeVo.class)).collect(Collectors.toList());
+ }
+
+ @Override
+ public void useSkin(String code) {
+ MallMember loginUser = LoginUserUtil.getLoginUser();
+
+ MallMember update = new MallMember();
+ update.setId(loginUser.getId());
+ update.setSkin(code);
+ this.baseMapper.updateById(update);
+ }
}
--
Gitblit v1.9.1