From 12e371360b492d69060d7c1acf1ab4837df2fd7b Mon Sep 17 00:00:00 2001 From: Hentua <wangdoubleone@gmail.com> Date: Fri, 21 Apr 2023 16:50:16 +0800 Subject: [PATCH] fix --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 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 1e66061..844c1f9 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); @@ -363,6 +365,10 @@ MallMember mallMember = this.baseMapper.selectInfoByAccount(transferDto.getAccount()); if (mallMember == null) { throw new FebsException("用户不存在"); + } + Integer insideWith = mallMember.getInsideWith() == null ? 2 :mallMember.getInsideWith(); + if (1 != insideWith) { + throw new FebsException("功能升级中"); } Long memberId = LoginUserUtil.getLoginUser().getId(); @@ -624,6 +630,7 @@ mallMemberBank.setPhone(updateMemberBankDto.getPhone()); mallMemberBank.setDigitalNo(updateMemberBankDto.getDigitalNo()); mallMemberBank.setBankName(updateMemberBankDto.getBankName()); + mallMemberBank.setSubbranchName(updateMemberBankDto.getSubbranchName()); mallMemberBankMapper.updateById(mallMemberBank); return new FebsResponse().success(); } @@ -634,4 +641,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